massive_record 0.1.1 → 0.2.0.beta

data/spec/shared/orm/relations/singular_proxy.rb

@@ -0,0 +1,68 @@
+shared_examples_for "singular proxy" do
+  let(:proxy_target) { mock(Object).as_null_object }
+  let(:find_proxy_target_returns) { subject.represents_a_collection? ? [proxy_target] : proxy_target }
+
+  before do
+    subject.metadata = mock(MassiveRecord::ORM::Relations::Metadata, :find_with => nil).as_null_object if subject.metadata.nil?
+  end
+
+  describe "forward method calls to proxy_target" do
+    let(:proxy_target) { mock(Object, :proxy_target_method => "return value", :id => "dummy-id") }
+
+    before do
+      subject.proxy_target = proxy_target
+    end
+    
+
+    describe "#respond_to?" do
+      it "should check proxy to see if it responds to something" do
+        should respond_to :proxy_target
+      end
+      
+      it "should respond to proxy_target_method" do
+        should respond_to :proxy_target_method
+      end
+
+      it "should not respond to a dummy method" do
+        should_not respond_to :dummy_method_which_does_not_exists 
+      end
+    end
+
+
+    describe "#method_missing" do
+      it "should call proxy's method if exists in proxy" do
+        subject.should_receive(:loaded?).once
+        subject.loaded?
+      end
+
+      it "should call proxy_target's method if it responds to it" do
+        proxy_target.should_receive(:proxy_target_method).and_return(proxy_target)
+        subject.proxy_target_method.should == proxy_target
+      end
+
+      it "should rause no method error if no one responds to it" do
+        lambda { subject.dummy_method_which_does_not_exists }.should raise_error NoMethodError
+      end
+    end
+
+    describe "comparison of class" do
+      let(:proxy_target) { Person.new }
+
+      it "should be answer correctly to which class it is" do
+        subject.should be_a(Person)
+      end
+
+      it "should be comparable correctly" do
+        (Person === subject).should be_true
+      end
+
+      it "should be compared correctly in a case when construction" do
+        case subject
+        when Person
+        else
+          fail
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,3 +13,4 @@ end
 
 Dir["#{SPEC_DIR}/orm/models/*.rb"].each { |f| require f }
 Dir["#{SPEC_DIR}/support/**/*.rb"].each { |f| require f }
+Dir["#{SPEC_DIR}/shared/**/*.rb"].each { |f| require f }

data/spec/thrift/cases/encoding_spec.rb

@@ -24,23 +24,44 @@ describe "encoding" do
   it "should save standard caracteres" do
     m        = Apache::Hadoop::Hbase::Thrift::Mutation.new
     m.column = "info:first_name"
-    m.value  = "Vincent"
+    m.value  = "Vincent".force_encoding(Encoding::BINARY)
     
-    m.value.encoding.should == Encoding::UTF_8
-    @client.mutateRow(@table_name, "ID1", [m]).should be_nil    
+    m.value.encoding.should == Encoding::BINARY
+    @client.mutateRow(@table_name, "ID1", [m]).should be_nil
   end
   
   it "should save UTF8 caracteres" do
-    pending "UTF8 enconding need to be fixed!"
-    
     m        = Apache::Hadoop::Hbase::Thrift::Mutation.new
     m.column = "info:first_name"
-    m.value  = "Thorbjørn"
+    m.value  = "Thorbjørn".force_encoding(Encoding::BINARY)
     
-    m.value.encoding.should == Encoding::UTF_8
+    m.value.encoding.should == Encoding::BINARY
     @client.mutateRow(@table_name, "ID1", [m]).should be_nil
   end
   
+  it "should save JSON" do
+    m        = Apache::Hadoop::Hbase::Thrift::Mutation.new
+    m.column = "info:first_name"
+    m.value  = { :p1 => "Vincent", :p2 => "Thorbjørn"}.to_json.force_encoding(Encoding::BINARY)
+    
+    m.value.encoding.should == Encoding::BINARY
+    @client.mutateRow(@table_name, "ID1", [m]).should be_nil   
+  end
+  
+  it "should take care of several encodings" do
+    m1        = Apache::Hadoop::Hbase::Thrift::Mutation.new
+    m1.column = "info:first_name"
+    m1.value  = { :p1 => "Vincent", :p2 => "Thorbjørn"}.to_json.force_encoding(Encoding::BINARY)
+    
+    m2        = Apache::Hadoop::Hbase::Thrift::Mutation.new
+    m2.column = "info:company_name"
+    # "incompatible character encodings: ASCII-8BIT and UTF-8" is raised if we don't force encoding
+    # because m1 is binary and m2 is UTF-8
+    m2.value  = "Thorbjørn".force_encoding(Encoding::BINARY)
+    
+    @client.mutateRow(@table_name, "ID1", [m1, m2]).should be_nil
+  end
+  
   it "should destroy the table" do
     @client.disableTable(@table_name).should be_nil
     @client.deleteTable(@table_name).should be_nil

data/spec/wrapper/cases/adapter_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "The Massive Record adapter" do
+  
+  it "should default to thrift" do
+    MassiveRecord.adapter.should == :thrift
+  end
+
+end

data/spec/wrapper/cases/connection_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 
-describe MassiveRecord::Wrapper::Connection do
+describe "A connection" do
   
   before do
     @connection = MassiveRecord::Wrapper::Connection.new(:host => MR_CONFIG['host'], :port => MR_CONFIG['port'])
   end
   
+  after do
+    @connection.close if @connection.open?
+  end
+  
   it "should have a host and port attributes" do
     connections = [@connection, MassiveRecord::Wrapper::Connection.new(:host => "somewhere")]
     
@@ -15,25 +19,24 @@ describe MassiveRecord::Wrapper::Connection do
     end
   end 
   
-  it "should not be active" do
-    pending "should we implement this, Vincent? :-)"
-    @connection.active?.should be_false
+  it "should not be open" do
+    @connection.open?.should be_false
   end
    
   it "should not be able to open a new connection with a wrong configuration and Raise an error" do
     @connection.port = 1234
-    lambda{@connection.open}.should raise_error(MassiveRecord::ConnectionException)
+    lambda{@connection.open}.should raise_error(MassiveRecord::Wrapper::Errors::ConnectionException)
   end
   
-  it "should be able to open a new connection with a good configuration" do
+  it "should be open if opened" do
     @connection.open.should be_true
+    @connection.open?.should be_true
   end
   
-  it "should not be active if it is closed" do 
-    @connection.open
-    @connection.active?.should be_true
+  it "should not be open if closed" do 
+    @connection.open.should be_true
     @connection.close.should be_true
-    @connection.active?.should be_false
+    @connection.open?.should be_false
   end
   
   it "should have a collection of tables" do

data/spec/wrapper/cases/table_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
-describe MassiveRecord::Wrapper::Table do
+describe "A table" do
   
-  describe "with a new connection" do
+  before(:all) do
+    @connection = MassiveRecord::Wrapper::Connection.new(:host => MR_CONFIG['host'], :port => MR_CONFIG['port'])
+    @connection.open
+  end
+  
+  describe "with an open connection" do
 
     before do
-      @connection = MassiveRecord::Wrapper::Connection.new(:host => MR_CONFIG['host'], :port => MR_CONFIG['port'])
-      @connection.open
-      
       @table = MassiveRecord::Wrapper::Table.new(@connection, MR_CONFIG['table'])
     end
   
@@ -53,31 +55,27 @@ describe MassiveRecord::Wrapper::Table do
         row.values = { 
           :info => { :first_name => "John", :last_name => "Doe", :email => "john@base.com" },
           :misc => { 
-            :like => ["Eating", "Sleeping", "Coding"], 
+            :like => ["Eating", "Sleeping", "Coding"].to_json, 
             :dislike => {
               "Washing" => "Boring 6/10",
               "Ironing" => "Boring 8/10"
-            },
-            :empty => {},
+            }.to_json,
+            :empty => {}.to_json,
             :value_to_increment => "1"
           }
         }
         row.table = @table
         row.save
       end
-      
-      it "should contains one row" do
-        @table.all.size.should == 1
-      end
-      
-      it "should load the first row" do
-        @table.first.should be_a_kind_of(MassiveRecord::Wrapper::Row)
-      end
-        
+              
       it "should list 5 column names" do
         @table.column_names.size.should == 7
       end
       
+      it "should only load one column" do
+        @table.get("ID1", :info, :first_name).should == "John"
+      end
+      
       it "should only load one column family" do
         @table.first(:select => ["info"]).column_families.should == ["info"]
         @table.all(:limit => 1, :select => ["info"]).first.column_families.should == ["info"]
@@ -137,9 +135,6 @@ describe MassiveRecord::Wrapper::Table do
         row = MassiveRecord::Wrapper::Row.new
         row.updated_at.should be_nil
       end
-
-      
-      
       
       it "should merge data" do
         row = @table.first
@@ -149,24 +144,11 @@ describe MassiveRecord::Wrapper::Table do
         )
       end
       
-      it "should merge array data" do
-        row = @table.first
-        row.merge_columns({ :misc => { :like => ["Playing"] } })
-        row.columns["misc:like"].deserialize_value.should =~ ["Eating", "Sleeping", "Coding", "Playing"]
-      end
-      
-      it "should merge hash data" do
-        row = @table.first
-        row.merge_columns({ :misc => { :dislike => { "Ironing" => "Boring 10/10", "Running" => "Boring 5/10" } } })
-        row.columns["misc:dislike"].deserialize_value["Ironing"].should eql("Boring 10/10") # Check updated value
-        row.columns["misc:dislike"].deserialize_value.keys.should =~ ["Washing", "Ironing", "Running"] # Check new value
-      end
-      
       it "should deserialize Array / Hash values from YAML automatically" do
         row = @table.first
-        row.values["misc:like"].class.should eql(Array)
-        row.values["misc:dislike"].class.should eql(Hash)
-        row.values["misc:empty"].class.should eql(Hash)
+        ActiveSupport::JSON.decode(row.values["misc:like"]).class.should eql(Array)
+        ActiveSupport::JSON.decode(row.values["misc:dislike"]).class.should eql(Hash)
+        ActiveSupport::JSON.decode(row.values["misc:empty"]).class.should eql(Hash)
       end
       
       it "should display the previous value (versioning) of the column 'info:first_name'" do
@@ -214,71 +196,89 @@ describe MassiveRecord::Wrapper::Table do
         @table.first.should be_nil
       end
       
-      it "should create 5 rows" do
+      it "should exists in the database" do
+        @table.exists?.should be_true
+      end
+  
+      it "should destroy the test table" do
+        @table.destroy.should be_true
+      end
+    end
+  
+  end
+  
+  describe "can be scanned" do
+    before do
+      @table = MassiveRecord::Wrapper::Table.new(@connection, MR_CONFIG['table'])
+      @table.column_families.create(:info)
+      @table.column_families.create(:misc)
+      
+      @table.save
+      
+      ["A", "B"].each do |prefix|
         1.upto(5).each do |i|
           row = MassiveRecord::Wrapper::Row.new
-          row.id = "ID#{i}"
+          row.id = "#{prefix}#{i}"
           row.values = { :info => { :first_name => "John #{i}", :last_name => "Doe #{i}" } }
           row.table = @table
           row.save
         end
-        
-        @table.all.size.should == 5
-      end
-      
-      it "should find rows" do
-        ids_list = [["ID1"], ["ID1", "ID2", "ID3"]]
-        ids_list.each do |ids|
-          @table.find(ids).each do |row|
-            ids.include?(row.id).should be_true
-          end
-        end
-      end
-    
-      it "should collect 5 IDs" do
-        @table.all.collect(&:id).should eql(1.upto(5).collect{|i| "ID#{i}"})
-      end
-    
-      it "should iterate through a collection of rows" do
-        @table.all.each do |row|
-          row.id.should_not be_nil
-        end
       end
+    end
     
-      it "should iterate through a collection of rows using a batch process" do
-        group_number = 0
-        @table.find_in_batches(:batch_size => 2, :select => ["info"]) do |group|
-          group_number += 1
-          group.each do |row|
-            row.id.should_not be_nil
-          end
-        end        
-        group_number.should == 3
-      end
+    after do
+      @table.destroy
+    end
     
-      it "should find 1 row using the :start option" do
-        @table.all(:start => "ID1").size.should == 1
-      end
+    it "should contains 10 rows" do
+      @table.all.size.should == 10
+      @table.all.collect(&:id).size.should == 10
+    end
     
-      it "should find 5 rows using the :start option" do
-        @table.all(:start => "ID").size.should == 5
-      
-      end
+    it "should load the first row" do
+      @table.first.should be_a_kind_of(MassiveRecord::Wrapper::Row)
+    end
     
-      it "should find 4 rows using the :offset option" do
-        @table.all(:offset => "ID2").size.should == 4
-      end
-      
-      it "should exists in the database" do
-        @table.exists?.should be_true
+    it "should find rows from a list of IDs" do
+      ids_list = [["A1"], ["A1", "A2", "A3"]]
+      ids_list.each do |ids|
+        @table.find(ids).each do |row|
+          ids.include?(row.id).should be_true
+        end
       end
+    end
   
-      it "should destroy the test table" do
-        @table.destroy.should be_true
+    it "should iterate through a collection of rows" do
+      @table.all.each do |row|
+        row.id.should_not be_nil
       end
+    end
   
+    it "should iterate through a collection of rows using a batch process" do
+      group_number = 0
+      @table.find_in_batches(:batch_size => 2, :select => ["info"]) do |group|
+        group_number += 1
+        group.each do |row|
+          row.id.should_not be_nil
+        end
+      end        
+      group_number.should == 5
     end
   
-  end
+    it "should find 1 row using the :start option" do
+      @table.all(:start => "A1").size.should == 1
+    end
+  
+    it "should find 5 rows using the :start option" do
+      @table.all(:start => "A").size.should == 5
+    end
   
+    it "should find 9 rows using the :offset option" do
+      @table.all(:offset => "A2").size.should == 9
+    end
+    
+    it "should find 4 rows using both :offset and :start options" do
+      @table.all(:offset => "A2", :start => "A").size.should == 4
+    end
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: massive_record
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  - beta
+  version: 0.2.0.beta
 platform: ruby
 authors: 
 - Companybook
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,22 +92,42 @@ files:
 - Manifest
 - README.md
 - Rakefile
-- TODO.md
 - autotest/discover.rb
 - lib/massive_record.rb
-- lib/massive_record/exceptions.rb
+- lib/massive_record/adapters/initialize.rb
+- lib/massive_record/adapters/thrift/adapter.rb
+- lib/massive_record/adapters/thrift/column_family.rb
+- lib/massive_record/adapters/thrift/connection.rb
+- lib/massive_record/adapters/thrift/hbase/hbase.rb
+- lib/massive_record/adapters/thrift/hbase/hbase_constants.rb
+- lib/massive_record/adapters/thrift/hbase/hbase_types.rb
+- lib/massive_record/adapters/thrift/row.rb
+- lib/massive_record/adapters/thrift/scanner.rb
+- lib/massive_record/adapters/thrift/table.rb
 - lib/massive_record/orm/attribute_methods.rb
 - lib/massive_record/orm/attribute_methods/dirty.rb
 - lib/massive_record/orm/attribute_methods/read.rb
 - lib/massive_record/orm/attribute_methods/write.rb
 - lib/massive_record/orm/base.rb
 - lib/massive_record/orm/callbacks.rb
+- lib/massive_record/orm/coders.rb
+- lib/massive_record/orm/coders/chained.rb
+- lib/massive_record/orm/coders/json.rb
+- lib/massive_record/orm/coders/yaml.rb
 - lib/massive_record/orm/column.rb
 - lib/massive_record/orm/config.rb
 - lib/massive_record/orm/errors.rb
 - lib/massive_record/orm/finders.rb
+- lib/massive_record/orm/finders/scope.rb
 - lib/massive_record/orm/id_factory.rb
 - lib/massive_record/orm/persistence.rb
+- lib/massive_record/orm/relations.rb
+- lib/massive_record/orm/relations/interface.rb
+- lib/massive_record/orm/relations/metadata.rb
+- lib/massive_record/orm/relations/proxy.rb
+- lib/massive_record/orm/relations/proxy/references_many.rb
+- lib/massive_record/orm/relations/proxy/references_one.rb
+- lib/massive_record/orm/relations/proxy/references_one_polymorphic.rb
 - lib/massive_record/orm/schema.rb
 - lib/massive_record/orm/schema/column_families.rb
 - lib/massive_record/orm/schema/column_family.rb
@@ -115,23 +136,18 @@ files:
 - lib/massive_record/orm/schema/field.rb
 - lib/massive_record/orm/schema/fields.rb
 - lib/massive_record/orm/schema/table_interface.rb
+- lib/massive_record/orm/single_table_inheritance.rb
 - lib/massive_record/orm/table.rb
 - lib/massive_record/orm/timestamps.rb
 - lib/massive_record/orm/validations.rb
 - lib/massive_record/rails/railtie.rb
 - lib/massive_record/spec/support/simple_database_cleaner.rb
-- lib/massive_record/thrift/hbase.rb
-- lib/massive_record/thrift/hbase_constants.rb
-- lib/massive_record/thrift/hbase_types.rb
 - lib/massive_record/version.rb
+- lib/massive_record/wrapper/adapter.rb
 - lib/massive_record/wrapper/base.rb
 - lib/massive_record/wrapper/cell.rb
 - lib/massive_record/wrapper/column_families_collection.rb
-- lib/massive_record/wrapper/column_family.rb
-- lib/massive_record/wrapper/connection.rb
-- lib/massive_record/wrapper/row.rb
-- lib/massive_record/wrapper/scanner.rb
-- lib/massive_record/wrapper/table.rb
+- lib/massive_record/wrapper/errors.rb
 - lib/massive_record/wrapper/tables_collection.rb
 - massive_record.gemspec
 - spec/config.yml.example
@@ -143,28 +159,45 @@ files:
 - spec/orm/cases/config_spec.rb
 - spec/orm/cases/dirty_spec.rb
 - spec/orm/cases/encoding_spec.rb
+- spec/orm/cases/finder_default_scope.rb
+- spec/orm/cases/finder_scope_spec.rb
 - spec/orm/cases/finders_spec.rb
-- spec/orm/cases/hbase/connection_spec.rb
 - spec/orm/cases/i18n_spec.rb
 - spec/orm/cases/id_factory_spec.rb
 - spec/orm/cases/persistence_spec.rb
+- spec/orm/cases/single_table_inheritance_spec.rb
 - spec/orm/cases/table_spec.rb
 - spec/orm/cases/timestamps_spec.rb
 - spec/orm/cases/validation_spec.rb
+- spec/orm/coders/chained_spec.rb
+- spec/orm/coders/json_spec.rb
+- spec/orm/coders/yaml_spec.rb
 - spec/orm/models/address.rb
+- spec/orm/models/best_friend.rb
+- spec/orm/models/friend.rb
 - spec/orm/models/person.rb
-- spec/orm/models/person_with_timestamps.rb
+- spec/orm/models/person_with_timestamp.rb
 - spec/orm/models/test_class.rb
+- spec/orm/relations/interface_spec.rb
+- spec/orm/relations/metadata_spec.rb
+- spec/orm/relations/proxy/references_many_spec.rb
+- spec/orm/relations/proxy/references_one_polymorphic_spec.rb
+- spec/orm/relations/proxy/references_one_spec.rb
+- spec/orm/relations/proxy_spec.rb
 - spec/orm/schema/column_families_spec.rb
 - spec/orm/schema/column_family_spec.rb
 - spec/orm/schema/column_interface_spec.rb
 - spec/orm/schema/field_spec.rb
 - spec/orm/schema/fields_spec.rb
 - spec/orm/schema/table_interface_spec.rb
+- spec/shared/orm/coders/an_orm_coder.rb
+- spec/shared/orm/relations/proxy.rb
+- spec/shared/orm/relations/singular_proxy.rb
 - spec/spec_helper.rb
 - spec/support/connection_helpers.rb
 - spec/support/mock_massive_record_connection.rb
 - spec/thrift/cases/encoding_spec.rb
+- spec/wrapper/cases/adapter_spec.rb
 - spec/wrapper/cases/connection_spec.rb
 - spec/wrapper/cases/table_spec.rb
 has_rdoc: true
@@ -187,11 +220,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: massive_record
@@ -209,27 +244,44 @@ test_files:
 - spec/orm/cases/config_spec.rb
 - spec/orm/cases/dirty_spec.rb
 - spec/orm/cases/encoding_spec.rb
+- spec/orm/cases/finder_default_scope.rb
+- spec/orm/cases/finder_scope_spec.rb
 - spec/orm/cases/finders_spec.rb
-- spec/orm/cases/hbase/connection_spec.rb
 - spec/orm/cases/i18n_spec.rb
 - spec/orm/cases/id_factory_spec.rb
 - spec/orm/cases/persistence_spec.rb
+- spec/orm/cases/single_table_inheritance_spec.rb
 - spec/orm/cases/table_spec.rb
 - spec/orm/cases/timestamps_spec.rb
 - spec/orm/cases/validation_spec.rb
+- spec/orm/coders/chained_spec.rb
+- spec/orm/coders/json_spec.rb
+- spec/orm/coders/yaml_spec.rb
 - spec/orm/models/address.rb
+- spec/orm/models/best_friend.rb
+- spec/orm/models/friend.rb
 - spec/orm/models/person.rb
-- spec/orm/models/person_with_timestamps.rb
+- spec/orm/models/person_with_timestamp.rb
 - spec/orm/models/test_class.rb
+- spec/orm/relations/interface_spec.rb
+- spec/orm/relations/metadata_spec.rb
+- spec/orm/relations/proxy/references_many_spec.rb
+- spec/orm/relations/proxy/references_one_polymorphic_spec.rb
+- spec/orm/relations/proxy/references_one_spec.rb
+- spec/orm/relations/proxy_spec.rb
 - spec/orm/schema/column_families_spec.rb
 - spec/orm/schema/column_family_spec.rb
 - spec/orm/schema/column_interface_spec.rb
 - spec/orm/schema/field_spec.rb
 - spec/orm/schema/fields_spec.rb
 - spec/orm/schema/table_interface_spec.rb
+- spec/shared/orm/coders/an_orm_coder.rb
+- spec/shared/orm/relations/proxy.rb
+- spec/shared/orm/relations/singular_proxy.rb
 - spec/spec_helper.rb
 - spec/support/connection_helpers.rb
 - spec/support/mock_massive_record_connection.rb
 - spec/thrift/cases/encoding_spec.rb
+- spec/wrapper/cases/adapter_spec.rb
 - spec/wrapper/cases/connection_spec.rb
 - spec/wrapper/cases/table_spec.rb