massive_record 0.2.1 → 0.2.2.rc1

data/lib/massive_record/version.rb

@@ -1,3 +1,3 @@
 module MassiveRecord
-  VERSION = "0.2.1"
+  VERSION = "0.2.2.rc1"
 end

data/lib/massive_record/wrapper/cell.rb

@@ -10,7 +10,7 @@ module MassiveRecord
       #
       # Packs an integer as a 64-bit signed integer, native endian (int64_t)
       # Reverse it as the byte order in hbase are reversed
-      #
+      p #
       def self.integer_to_hex_string(int)
         [int].pack('q').reverse
       end
@@ -24,6 +24,13 @@ module MassiveRecord
       end
 
 
+      def self.populate_from_tcell(tcell)
+        new({
+          :value => tcell.value,
+          :created_at => Time.at(tcell.timestamp / 1000, (tcell.timestamp % 1000) * 1000)
+        })
+      end
+
 
       def initialize(opts = {})
         self.value = opts[:value]

data/massive_record.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "massive_record"
 
 
-  s.add_dependency "thrift", ">= 0.5.0"
-  s.add_dependency "activesupport"
-  s.add_dependency "activemodel"
+  s.add_dependency "thrift", "= 0.6.0"
+  s.add_dependency "activesupport", "~> 3.0.7"
+  s.add_dependency "activemodel", "~> 3.0.7"
   s.add_dependency "tzinfo"
 
-  s.add_development_dependency "rspec", ">= 2.1.0"
+  s.add_development_dependency "rspec"
 
 
   s.files         = `git ls-files`.split("\n")

data/spec/adapter/thrift/atomic_increment_spec.rb

@@ -51,5 +51,21 @@ describe MassiveRecord::Wrapper::Row do
       subject.atomic_increment(atomic_inc_attr_name)
       subject.read_atomic_integer_value(atomic_inc_attr_name).should eq 1
     end
+
+    it "returns -1 after one decrementation of 1" do
+      subject.atomic_decrement(atomic_inc_attr_name).should eq -1
+      subject.read_atomic_integer_value(atomic_inc_attr_name).should eq -1
+    end
+  end
+
+
+  describe "#atomic_decrement" do
+    it "decrements to -1 when called on a new value" do
+      subject.atomic_decrement(atomic_inc_attr_name).should eq -1
+    end
+
+    it "decrements by 2 when asked to do so" do
+      subject.atomic_decrement(atomic_inc_attr_name, 2).should eq -2
+    end
   end
 end

data/spec/adapter/thrift/table_find_spec.rb

@@ -8,7 +8,7 @@ describe MassiveRecord::Adapters::Thrift::Table do
   end
 
   subject do
-    MassiveRecord::Wrapper::Table.new(@connection, MR_CONFIG['table'])
+    MassiveRecord::Wrapper::Table.new(connection, MR_CONFIG['table'])
   end
 
 
@@ -26,7 +26,7 @@ describe MassiveRecord::Adapters::Thrift::Table do
   before do
     2.times do |index|
       MassiveRecord::Wrapper::Row.new.tap do |row|
-        row.id = index.to_s
+        row.id = (index + 1).to_s
         row.values = {:base => {:first_name => "John-#{index}", :last_name => "Doe-#{index}" }}
         row.table = subject
         row.save
@@ -37,4 +37,16 @@ describe MassiveRecord::Adapters::Thrift::Table do
   after do
     subject.all.each &:destroy
   end
+
+  it "finds one id" do
+    subject.find("1").id.should eq "1"
+  end
+
+  it "finds one id given as array" do
+    subject.find(["1"]).first.id.should eq "1"
+  end
+
+  it "finds multiple ids" do
+    subject.find(["1", "2"]).collect(&:id).should eq ["1", "2"]
+  end
 end

data/spec/adapter/thrift/table_spec.rb

@@ -297,20 +297,20 @@ describe "A table" do
       group_number.should == 5
     end
   
-    it "should find 1 row using the :start option" do
-      @table.all(:start => "A1").size.should == 1
+    it "should find 1 row using the :starts_with option" do
+      @table.all(:starts_with => "A1").size.should == 1
     end
   
-    it "should find 5 rows using the :start option" do
-      @table.all(:start => "A").size.should == 5
+    it "should find 5 rows using the :starts_with option" do
+      @table.all(:starts_with => "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
+    it "should find 4 rows using both :offset and :starts_with options" do
+      @table.all(:offset => "A2", :starts_with => "A").size.should == 4
     end
   end
 end

data/spec/adapter/thrift/utf8_encoding_of_id_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe MassiveRecord::Wrapper::Row do
+  let(:connection) do
+    MassiveRecord::Wrapper::Connection.new(:host => MR_CONFIG['host'], :port => MR_CONFIG['port']).tap do |connection|
+      connection.open
+    end
+  end
+
+  let(:table) do
+    MassiveRecord::Wrapper::Table.new(connection, MR_CONFIG['table']).tap do |table|
+      table.column_families.create(:misc)
+      table.save
+    end
+  end
+
+  let(:id) { 'thorbjørn' }
+  let(:name) { 'Thorbjorn' }
+
+  subject do
+    MassiveRecord::Wrapper::Row.new.tap do |row|
+      row.id = id
+      row.values = {:misc => {:name => name}}
+      row.table = table
+    end
+  end
+
+
+
+  after do
+    table.all.each &:destroy
+  end
+
+  after :all do
+    table.destroy
+    connection.close
+  end
+
+  
+
+
+
+  describe "ids utf-8 encoded" do
+    context "new record" do
+      it "saves" do
+        subject.save.should be_true
+      end
+    end
+
+    context "persisted record" do
+      before { subject.save }
+
+      it "finds" do
+        table.find(id).values["misc:name"].should eq name
+      end
+
+      it "gets a cell" do
+        table.get(id, :misc, :name).should eq name
+      end
+
+      it "finds with starts_with option" do
+        table.all(:starts_with => id).first.values["misc:name"].should eq name
+      end
+
+      it "finds with offset option" do
+        table.all(:offset => id).first.values["misc:name"].should eq name
+      end
+    end
+  end
+end

data/spec/orm/cases/attribute_methods_spec.rb

@@ -2,66 +2,259 @@ require 'spec_helper'
 require 'orm/models/person'
 
 describe "attribute methods" do
-  before do
-    @model = Person.new "5", :name => "John", :age => "15"
-  end
+  include TimeZoneHelper
+
+  subject { Person.new "5", :name => "John", :age => "15" }
 
   it "should define reader method" do
-    @model.name.should == "John"
+    subject.name.should == "John"
   end
 
   it "should define writer method" do
-    @model.name = "Bar"
-    @model.name.should == "Bar"
+    subject.name = "Bar"
+    subject.name.should == "Bar"
   end
 
   it "should be possible to write attributes" do
-    @model.write_attribute :name, "baaaaar"
-    @model.name.should == "baaaaar"
+    subject.write_attribute :name, "baaaaar"
+    subject.name.should == "baaaaar"
+  end
+
+
+  it "converts correcly written floats as string to float on write" do
+    subject.write_attribute(:carma, "1.5")
+    subject.carma.should eq 1.5
+  end
+
+  it "converts baldy written floats as string to float on write" do
+    subject.write_attribute(:carma, "1.5f")
+    subject.carma.should eq 1.5
+  end
+
+  it "keeps nil when assigned to float" do
+    subject.write_attribute(:carma, nil)
+    subject.carma.should eq nil
+  end
+
+  it "keeps empty string when assigned to float" do
+    subject.write_attribute(:carma, "")
+    subject.carma.should eq nil
   end
 
+  it "converts correcly written integers as string to integer on write" do
+    subject.write_attribute(:points, "1")
+    subject.points.should eq 1
+  end
+
+  it "converts baldy written integers as string to integer on write" do
+    subject.write_attribute(:points, "1f")
+    subject.points.should eq 1
+  end
+
+  it "keeps nil when assigned to integer" do
+    subject.write_attribute(:points, nil)
+    subject.points.should eq nil
+  end
+
+  it "keeps empty string when assigned to integer" do
+    subject.write_attribute(:points, "")
+    subject.points.should eq nil
+  end
+
+
+
+
+
   it "should be possible to read attributes" do
-    @model.read_attribute(:name).should == "John"
+    subject.read_attribute(:name).should == "John"
   end
 
   it "should return casted value when read" do
-    @model.read_attribute(:age).should == 15
+    subject.read_attribute(:age).should == 15
   end
 
   it "should read from a method if it has been defined" do
-    @model.should_receive(:_name).and_return("my name is")
-    @model.read_attribute(:name).should eq "my name is"
+    subject.should_receive(:_name).and_return("my name is")
+    subject.read_attribute(:name).should eq "my name is"
   end
   
   describe "#attributes" do
     it "should contain the id" do
-      @model.attributes.should include("id")
+      subject.attributes.should include("id")
     end
 
     it "should not return @attributes directly" do
-      @model.attributes.object_id.should_not == @model.instance_variable_get(:@attributes).object_id
+      subject.attributes.object_id.should_not == subject.instance_variable_get(:@attributes).object_id
     end
 
     it "should ask read_attribute for help" do
-      @model.should_receive(:read_attribute).any_number_of_times.and_return("stub")
-      @model.attributes['name'].should eq 'stub'
+      subject.should_receive(:read_attribute).any_number_of_times.and_return("stub")
+      subject.attributes['name'].should eq 'stub'
     end
   end
 
   describe "#attributes=" do
     it "should simply return if incomming value is not a hash" do
-      @model.attributes = "FOO BAR"
-      @model.attributes.keys.should include("name")
+      subject.attributes = "FOO BAR"
+      subject.attributes.keys.should include("name")
     end
 
     it "should mass assign attributes" do
-      @model.attributes = {:name => "Foo", :age => 20}
-      @model.name.should == "Foo"
-      @model.age.should == 20
+      subject.attributes = {:name => "Foo", :age => 20}
+      subject.name.should == "Foo"
+      subject.age.should == 20
     end
 
     it "should raise an error if we encounter an unkown attribute" do
-      lambda { @model.attributes = {:unkown => "foo"} }.should raise_error MassiveRecord::ORM::UnknownAttributeError
+      lambda { subject.attributes = {:unkown => "foo"} }.should raise_error MassiveRecord::ORM::UnknownAttributeError
+    end
+
+    describe "multiparameter" do
+      describe "date" do
+        let(:date) { Date.new 1981, 8, 20 }
+        let(:params) do
+          {
+            "date_of_birth(1i)" => date.year.to_s,
+            "date_of_birth(2i)" => date.month.to_s,
+            "date_of_birth(3i)" => date.day.to_s
+          }
+        end
+
+        it "parses a complete multiparameter" do
+          subject.attributes = params
+          subject.date_of_birth.should eq date
+        end
+
+        it "parses when year is missing" do
+          params["date_of_birth(1i)"] = ""
+          subject.attributes = params
+          subject.date_of_birth.should eq Date.new(1, date.month, date.day)
+        end
+
+        it "parses when month is missing" do
+          params["date_of_birth(2i)"] = ""
+          subject.attributes = params
+          subject.date_of_birth.should eq Date.new(date.year, 1, date.day)
+        end
+
+        it "parses when day is missing" do
+          params["date_of_birth(3i)"] = ""
+          subject.attributes = params
+          subject.date_of_birth.should eq Date.new(date.year, date.month, 1)
+        end
+
+        it "sets to nil if all are blank" do
+          params["date_of_birth(1i)"] = ""
+          params["date_of_birth(2i)"] = ""
+          params["date_of_birth(3i)"] = ""
+          subject.attributes = params
+          subject.date_of_birth.should be_nil
+        end
+
+        it "ignores the overflow of arguments" do
+          params["date_of_birth(4i)"] = "1"
+          params["date_of_birth(5i)"] = "2"
+          params["date_of_birth(6i)"] = "3"
+          subject.attributes = params
+          subject.date_of_birth.should eq date
+        end
+
+        it "sets to nil if any of the values are on wrong format" do
+          params["date_of_birth(3i)"] = "foobar"
+          subject.attributes = params
+          subject.date_of_birth.should be_nil
+        end
+      end
+
+      describe "time" do
+        let(:time) { Time.new 2011, 8, 20, 17, 30, 0 }
+        let(:tz_europe) { "Europe/Stockholm" }
+        let(:tz_us) { "Pacific Time (US & Canada)" }
+
+        let(:params) do
+          {
+            "last_signed_in_at(1i)" => time.year.to_s,
+            "last_signed_in_at(2i)" => time.month.to_s,
+            "last_signed_in_at(3i)" => time.day.to_s,
+            "last_signed_in_at(4i)" => time.hour.to_s,
+            "last_signed_in_at(5i)" => time.min.to_s,
+            "last_signed_in_at(6i)" => time.sec.to_s
+          }
+        end
+
+        it "parses complete multiparameter" do
+          subject.attributes = params
+          subject.last_signed_in_at.should eq time
+        end
+
+        it "parses complete multiparameter with time zone" do
+          in_time_zone tz_us do
+            subject.attributes = params
+            subject.last_signed_in_at.should eq time.in_time_zone(tz_us)
+          end
+        end
+
+        it "parses an old time" do
+          year = 1835
+          params["last_signed_in_at(1i)"] = year.to_s
+          subject.attributes = params
+          subject.last_signed_in_at.should eq Time.new(
+            year, time.month, time.day,
+            time.hour, time.min, time.sec
+          )
+        end
+
+        it "parses when year is missing" do
+          params["last_signed_in_at(1i)"] = ""
+          subject.attributes = params
+          subject.last_signed_in_at.should eq Time.new(
+            0, time.month, time.day,
+            time.hour, time.min, time.sec
+          )
+        end
+
+        it "parses when hour is missing" do
+          params["last_signed_in_at(4i)"] = ""
+          subject.attributes = params
+          subject.last_signed_in_at.should eq Time.new(
+            time.year, time.month, time.day,
+            0, time.min, time.sec
+          )
+        end
+
+        it "parses when seconds is missing" do
+          params["last_signed_in_at(6i)"] = ""
+          subject.attributes = params
+          subject.last_signed_in_at.should eq Time.new(
+            time.year, time.month, time.day,
+            time.hour, time.min, 0
+          )
+        end
+
+        it "sets to nil if all are blank" do
+          params["last_signed_in_at(1i)"] = ""
+          params["last_signed_in_at(2i)"] = ""
+          params["last_signed_in_at(3i)"] = ""
+          params["last_signed_in_at(4i)"] = ""
+          params["last_signed_in_at(5i)"] = ""
+          params["last_signed_in_at(6i)"] = ""
+          subject.attributes = params
+          subject.last_signed_in_at.should eq nil
+        end
+
+        it "sets to nil if any of the values are on wrong format" do
+          params["last_signed_in_at(3i)"] = "foobar"
+          subject.attributes = params
+          subject.last_signed_in_at.should be_nil
+        end
+
+        it "ignores the overflow of arguments" do
+          params["last_signed_in_at(7i)"] = "1"
+          params["last_signed_in_at(8i)"] = "2"
+          subject.attributes = params
+          subject.last_signed_in_at.should eq time
+        end
+      end
     end
   end
 end