ampere 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/ampere.gemspec

@@ -0,0 +1,88 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "ampere"
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Max Thom Stahl"]
+  s.date = "2012-01-18"
+  s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
+  s.email = "max@villainousindustri.es"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "ampere.gemspec",
+    "features/ampere.feature",
+    "features/step_definitions/ampere_steps.rb",
+    "features/support/env.rb",
+    "lib/ampere.rb",
+    "lib/ampere/collection.rb",
+    "lib/ampere/model.rb",
+    "spec/models/indices_spec.rb",
+    "spec/models/model_spec.rb",
+    "spec/models/queries_spec.rb",
+    "spec/models/relationships/belongs_to_spec.rb",
+    "spec/models/relationships/has_many_spec.rb",
+    "spec/models/relationships/has_one_spec.rb",
+    "spec/models/updates_spec.rb",
+    "spec/module/ampere_spec.rb",
+    "spec/module/collections_spec.rb",
+    "spec/spec_helper.rb",
+    "test/helper.rb",
+    "test/test_ampere.rb"
+  ]
+  s.homepage = "http://github.com/mstahl/ampere"
+  s.licenses = ["EPL"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A pure Ruby ORM for Redis."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+    else
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+  end
+end
+

data/lib/ampere/model.rb

@@ -5,6 +5,7 @@ module Ampere
     @fields         = []
     @field_defaults = {}
     @indices        = []
+    @field_types    = {}
     
     ### Instance methods
     
@@ -45,12 +46,12 @@ module Ampere
     # Initialize an instance like this:
     # 
     #     Post.new :title => "Kitties: Are They Awesome?"
-    def initialize(hash = {})
+    def initialize(hash = {}, unmarshal = false)
       hash.each do |k, v|
         if k == 'id' then
-          @id = v
+          @id = unmarshal ? Marshal.load(v) : v
         else
-          self.send("#{k}=", v)
+          self.send("#{k}=", (unmarshal and not k =~ /_id$/) ? Marshal.load(v) : v)
         end
       end
     end
@@ -67,7 +68,12 @@ module Ampere
       end
       
       self.class.fields.each do |k|
-        self.send("#{k}=", Ampere.connection.hget(@id, k))
+        v = Ampere.connection.hget(@id, k)
+        if k =~ /_id$/ then
+          self.send("#{k}=", v)
+        else
+          self.send("#{k}=", Marshal.load(v))
+        end
       end
       self
     end
@@ -80,7 +86,7 @@ module Ampere
       end
       
       self.attributes.each do |k, v|
-        Ampere.connection.hset(@id, k, v)
+        Ampere.connection.hset(@id, k, k =~ /_id$/ ? v : Marshal.dump(v))
       end
       
       self.class.indices.each do |index|
@@ -108,7 +114,7 @@ module Ampere
     def update_attribute(key, value)
       raise "Cannot update a nonexistent field!" unless self.class.fields.include?(key)
       self.send("#{key}=", value)
-      Ampere.connection.hset(@id, key, value)
+      Ampere.connection.hset(@id, key, Marshal.dump(value))
     end
     
     def update_attributes(hash = {})
@@ -158,17 +164,31 @@ module Ampere
       @fields         ||= []
       @field_defaults ||= {}
       @indices        ||= []
+      @field_types    ||= {}
       
       @fields << name
       
-      attr_accessor :"#{name}"
+      # attr_accessor :"#{name}"
       
       # Handle default value
       @field_defaults[name] = options[:default]
       
+      # Handle type, if any
+      if options[:type] then
+        @field_types[:"#{name}"] = options[:type].to_s
+      end
+      
       define_method :"#{name}" do
         instance_variable_get("@#{name}") or self.class.field_defaults[name]
       end
+      
+      define_method :"#{name}=" do |val|
+        if not self.class.field_types[:"#{name}"] or val.is_a?(eval(self.class.field_types[:"#{name}"])) then
+          instance_variable_set("@#{name}", val)
+        else
+          raise "Cannot set field of type #{self.class.field_types[name.to_sym]} with #{val.class} value"
+        end
+      end
     end
     
     def self.fields
@@ -179,11 +199,15 @@ module Ampere
       @field_defaults
     end
     
+    def self.field_types
+      @field_types
+    end
+    
     # Finds the record with the given ID, or the first that matches the given conditions
     def self.find(options = {})
       if options.class == String then
         if Ampere.connection.exists(options) then
-          new(Ampere.connection.hgetall(options))
+          new(Ampere.connection.hgetall(options), true)
         else
           nil
         end
@@ -239,6 +263,7 @@ module Ampere
       @fields         ||= []
       @field_defaults ||= {}
       @indices        ||= []
+      @field_types    ||= {}
       if field_name.class == String or field_name.class == Symbol then
         raise "Can't index a nonexistent field!" unless @fields.include?(field_name)
       elsif field_name.class == Array then
@@ -290,9 +315,11 @@ module Ampere
           
         unless nonindexed_fields.empty?
           results = all if results.nil?
-          results.map!{|r| r.class == String ? find(r) : r}
+          results = results.to_a.map{|r| r.class == String ? find(r) : r}
           nonindexed_fields.each do |key|
-            results.select!{|r| r.send(key) == options[key]}
+            results.select!{|r| 
+              r.send(key) == options[key]
+            }
           end
         end
         

data/spec/models/model_spec.rb

@@ -59,11 +59,16 @@ describe "Base models", :model => true do
           end
         end
         
+        it "should set field types for fields that have a type" do
+          Post.field_types.should_not be_nil
+          Post.field_types[:pageviews].should_not be_nil
+          Post.field_types[:pageviews].should == 'Integer'
+        end
+        
         it "shouldn't care what the value types are assigned to a field with no type defined" do
-          pending "Types not implemented yet."
-          # Assign a string to the :make of a motorcycle.
+          # Assign an int to the :title of a Post.
           (->{
-            Post.create :title     => "",
+            Post.create :title     => 1234,
                         :byline    => "",
                         :content   => "",
                         :pageviews => 1234
@@ -71,25 +76,24 @@ describe "Base models", :model => true do
             
           }).should_not raise_error
           
-          # Assign an integer to the :make of a motorcycle, for some reason.
+          # Assign a string to the :title of a Post.
           (->{
-            Motorcycle.create :make         => 1234,
-                              :model        => 'CB450SC',
-                              :year         => 1986,
-                              :displacement => 450.0
+            Post.create :title     => "1234",
+                        :byline    => "",
+                        :content   => "",
+                        :pageviews => 1234
           }).should_not raise_error
         end
         
-        it "should, given a field's type, only accept values for that field of that type", :wip => true do
-          pending "Types not implemented yet."
-          cycle = Motorcycle.create :make         => 'Honda',
-                                    :model        => 'CB450SC',
-                                    :year         => 1986,
-                                    :displacement => 450.0
+        it "should, given a field's type, only accept values for that field of that type" do
+          post = Post.create :title     => "",
+                             :byline    => "",
+                             :content   => "",
+                             :pageviews => 1234
           
           # Try to assign a string to :year, raising an error.
-          (->{cycle.year = "this is not a year"}).should raise_error
-          (->{cycle.year = 1996}).should_not raise_error
+          (->{post.pageviews = "this is not an integer"}).should raise_error
+          (->{post.pageviews = 4321}).should_not raise_error
         end
       end
     end
@@ -141,9 +145,15 @@ describe "Base models", :model => true do
       foo = Post.create :title => "Kitties!", :byline => "Max", :content => "Kitties are awesome."
       bar = Post.create :title => "Doggies!", :byline => "Max", :content => "Doggies are cool."
       
-      foo.should == foo # Post.new(:title => "Kitties!", :byline => "Max", :content => "Kitties are awesome.")
+      foo.should == foo
       foo.should_not == bar
       
+      foo.should eql(foo)
+      foo.should_not eql(bar)
+    end
+    
+    it "should also be able to determine the hash of a record, for equivalence testing" do
+      Post.new(title: "Guinea Pigs", byline: "Max", content: "Guinea pigs are super cute.").hash.is_a?(Fixnum).should be_true
     end
 
     it "should be able to tell when it's new" do
@@ -167,7 +177,7 @@ describe "Base models", :model => true do
     
     it "should be destroyable by itself" do
       another_post = Post.create :title   => "This one too, probably.",
-                                 :byline  => "Just seems like one bit",
+                                 :byline  => "Just seems like one big",
                                  :content => "non sequitor."
       id = another_post.id
       another_post.destroy.should == 1
@@ -175,10 +185,9 @@ describe "Base models", :model => true do
     end
     
     it "should be findable by ID" do
-      post = Post.new :title   => "foo",
-                      :byline  => "bar",
-                      :content => "baz"
-      post.save
+      post = Post.create :title   => "foo",
+                         :byline  => "bar",
+                         :content => "baz"
       Post.find(post.id).should == post
       # Since we're using GUIDs, this should also be true:
       post2 = Post.find(post.id)

data/spec/models/queries_spec.rb

@@ -77,7 +77,7 @@ describe 'queries', :queries => true do
   
   it 'should be able to find by two non-indexed fields at once' do
     # :breed and :age are not indexed
-    Kitty.where(:breed => "Domestic shorthair", :age => "17").count.should == 1
+    Kitty.where(:breed => "Domestic shorthair", :age => 17).count.should == 1
   end
   
   it 'should be able to find by a mix of indexed and non-indexed fields' do

data/spec/models/relationships/belongs_to_spec.rb

@@ -88,7 +88,15 @@ describe 'belongs_to relationships', :belongs_to => true do
   end
   
   it 'sets belongs_to pointer for has_many relationship' do
-    pending
+    @car.passengers = @car.passengers + [@driver]
+    @car.passengers = @car.passengers + [@passenger]
+    @car.save
+    
+    @driver.reload
+    @passenger.reload
+    
+    @driver.car.should == @car
+    @passenger.car.should == @car
   end
   
   ###

data/spec/models/relationships/has_one_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
-describe 'has_one relationships' do
+describe 'has_one relationships', has_one:true do
   before :all do
     Redis.new.flushall
     Ampere.connect

data/spec/module/collections_spec.rb

@@ -27,6 +27,7 @@ describe 'Collections', :collections => true do
     democrats.class.should == Ampere::Collection
     democrats.model.should == President
     democrats.raw_array.length.should == 3
+    democrats.length.should == 3
   end
   
   it 'should be accessible via [] like an Array' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70174558736960 !ruby/object:Gem::Requirement
+  requirement: &70220576682780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174558736960
+  version_requirements: *70220576682780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70174558736420 !ruby/object:Gem::Requirement
+  requirement: &70220576678180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174558736420
+  version_requirements: *70220576678180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70174558735860 !ruby/object:Gem::Requirement
+  requirement: &70220576676920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174558735860
+  version_requirements: *70220576676920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174558735300 !ruby/object:Gem::Requirement
+  requirement: &70220576675420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70174558735300
+  version_requirements: *70220576675420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174558734720 !ruby/object:Gem::Requirement
+  requirement: &70220576674400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70174558734720
+  version_requirements: *70220576674400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70174558734140 !ruby/object:Gem::Requirement
+  requirement: &70220576672900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174558734140
+  version_requirements: *70220576672900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174558733620 !ruby/object:Gem::Requirement
+  requirement: &70220576671880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174558733620
+  version_requirements: *70220576671880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70174558733120 !ruby/object:Gem::Requirement
+  requirement: &70220576670820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174558733120
+  version_requirements: *70220576670820
 description: An ActiveRecord/Mongoid-esque object model for the Redis key/value data
   store.
 email: max@villainousindustri.es
@@ -117,6 +117,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- ampere.gemspec
 - features/ampere.feature
 - features/step_definitions/ampere_steps.rb
 - features/support/env.rb
@@ -150,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4494108612008764104
+      hash: 4395967643533566831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: