massive_record 0.2.0.beta2 → 0.2.0

data/CHANGELOG.md

@@ -1,11 +1,24 @@
-# v0.2.0.beta2 (git develop)
+# v0.2.1 (git develop)
+
+
+# v0.2.0 (git master)
+
+- Intersection and union operations on arrays containing MassiveRecord objects is now working as expected.
+- You can now disallow nil values, and in that case we will ensure that given field has its default value.
+- Rails will now handle MassiveRecord::ORM::RecordNotFound correctly in a production environment, rendering 404.
+- record.attributes no longer returns internal @attributes-hash directly. Instead it iterates over all attributes,
+  fetches their values through read_attribute and then returns a new hash with these attribute-name-values pairs.
+- Fixed problem with STI sub classes in Rails development environment: Attributes defined in a sub class
+  was not loaded correctly first time you loaded a record through its parent class.
+
+# v0.2.0.beta2
 
 - We are now raising error if MassiveRecordClass.new(attributes) receives unknown attributes.
 - Added support for Record.new(:references_many => [record, record]) and a_record.references_many = [record, record]
 
 
 
-# v0.2.0.beta (git master)
+# v0.2.0.beta
 
 - ORM will now take care of serialize and de-serialize of attributes like arrays, hashes etc. It is doing so
   based on the type of your fields. You can select either JSON or YAML serialization for your data. As a default it

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    massive_record (0.2.0.beta2)
+    massive_record (0.2.0)
       activemodel
       activesupport
       thrift (>= 0.5.0)
@@ -9,11 +9,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
+      i18n (~> 0.5.0)
+    activesupport (3.0.7)
     builder (2.1.2)
     diff-lcs (1.1.2)
     i18n (0.5.0)
@@ -21,7 +21,7 @@ GEM
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)

data/README.md

@@ -13,6 +13,9 @@ http://jimbojw.com/wiki/index.php?title=Understanding_Hbase_and_BigTable
 
 ## Installation
 
+First of all: Please make sure you are using Ruby 1.9.2. For now, we are only ensuring
+that Massive Record works on that Ruby version, and we know it has some problems with 1.8.7.
+
   gem install massive_record
 
 ### Ruby on Rails
@@ -83,9 +86,10 @@ Here is an example of usage, both for Table and Column:
         field :email
         field :phone_number
         field :points, :integer, :default => 0
-        field :date_of_birth, :date
+        field :date_of_birth, :date, :allow_nil => false # Defaults to today
         field :newsletter, :boolean, :default => false
         field :type # Used for single table inheritance
+        field :in_the_future, :time, :default => Proc.new { 2.hours.from_now }
 
         timestamps # ..or field :created_at, :time
       end
@@ -119,6 +123,23 @@ Here is an example of usage, both for Table and Column:
     end
 
 
+### Related gems
+
+We have developed some gems which adds support for MassiveRecord. These are:
+
+#### ORM Adapter
+https://github.com/CompanyBook/orm_adapter
+Used by Devise. I guess we'll might release the code used to get Devise support in MR.
+
+#### Database Cleaner
+https://github.com/CompanyBook/database_cleaner
+User by for instance Cucumber and ourself with Rspec.
+
+#### Sunspot Rails
+https://github.com/CompanyBook/sunspot_massive_record
+Makes it easier to make things searchable with solr.
+
+
 ## Wrapper (adapter) API
 
 You can, if you'd like, work directly against the adapter.

data/lib/massive_record/adapters/thrift/row.rb

@@ -76,7 +76,7 @@ module MassiveRecord
             mutations.push(m)
           end
 
-          @table.client.mutateRow(@table.name, id.to_s, mutations).nil?
+          @table.client.mutateRow(@table.name, id.to_s.dup.force_encoding(Encoding::BINARY), mutations).nil?
         end
 
 

data/lib/massive_record/orm/attribute_methods.rb

@@ -12,7 +12,7 @@ module MassiveRecord
 
 
       def attributes
-        @attributes ||= {}
+        Hash[@attributes.collect { |attr_name, raw_value| [attr_name, read_attribute(attr_name)] }]
       end
       
       def attributes=(new_attributes)
@@ -56,6 +56,12 @@ module MassiveRecord
         attributes.merge! self.class.default_attributes_from_schema if self.class.respond_to? :default_attributes_from_schema
         attributes
       end
+
+      def fill_attributes_with_default_values_where_nil_is_not_allowed
+        attributes_schema.reject { |attr_name, field| field.allow_nil? || self[attr_name].present? }.each do |attr_name, field|
+          self[attr_name] = field.default
+        end
+      end
     end
   end
 end

data/lib/massive_record/orm/base.rb

@@ -128,6 +128,9 @@ module MassiveRecord
       # trust the coder's attributes and not load it with default values.
       #
       #   class Person < MassiveRecord::ORM::Table
+      #     column_family :base do
+      #       field :name
+      #     end
       #   end
       #
       #   person = Person.allocate
@@ -139,6 +142,7 @@ module MassiveRecord
         @relation_proxy_cache = {}
 
         self.attributes_raw = coder['attributes']
+        fill_attributes_with_default_values_where_nil_is_not_allowed
 
         _run_find_callbacks
         _run_initialize_callbacks
@@ -152,6 +156,9 @@ module MassiveRecord
       end
       alias_method :eql?, :==
 
+      def hash
+        id.hash
+      end
 
       def freeze
         @attributes.freeze

data/lib/massive_record/orm/relations/interface.rb

@@ -139,7 +139,7 @@ module MassiveRecord
             end
 
             if metadata.persisting_foreign_key?
-              add_field_to_column_family(metadata.store_in, metadata.foreign_key, :type => :array, :default => [])
+              add_field_to_column_family(metadata.store_in, metadata.foreign_key, :type => :array, :allow_nil => false)
             end
           end
         end

data/lib/massive_record/orm/schema/field.rb

@@ -4,10 +4,21 @@ module MassiveRecord
       class Field
         include ActiveModel::Validations
 
-        TYPES = [:string, :integer, :float, :boolean, :array, :hash, :date, :time]
+        TYPES_DEFAULTS_TO = {
+          :string => '',
+          :integer => 0,
+          :float => 0.0,
+          :boolean => false,
+          :array => [],
+          :hash => {},
+          :date => lambda { Date.today },
+          :time => lambda { Time.now }
+        }
+
+        TYPES = TYPES_DEFAULTS_TO.keys
 
         attr_writer :default
-        attr_accessor :name, :column, :type, :fields, :coder
+        attr_accessor :name, :column, :type, :fields, :coder, :allow_nil
 
 
         validates_presence_of :name
@@ -40,6 +51,7 @@ module MassiveRecord
           self.column = options[:column]
           self.type = options[:type] || :string
           self.default = options[:default]
+          self.allow_nil = options.has_key?(:allow_nil) ? options[:allow_nil] : true
 
           self.coder = options[:coder] || Base.coder
 
@@ -67,7 +79,12 @@ module MassiveRecord
         end
 
         def default
-          @default.duplicable? ? @default.dup : @default
+          @default = TYPES_DEFAULTS_TO[type] if !allow_nil? && @default.nil?
+          if @default.respond_to? :call
+            @default.call
+          else
+            @default.duplicable? ? @default.dup : @default
+          end
         end
 
         
@@ -85,6 +102,9 @@ module MassiveRecord
           @column = column
         end
 
+        def allow_nil?
+          !!allow_nil
+        end
 
 
 

data/lib/massive_record/orm/single_table_inheritance.rb

@@ -5,15 +5,43 @@ module MassiveRecord
 
       included do
         after_initialize :ensure_proper_type
+      end
+
+
+      module ClassMethods
+
+        private
+
+        #
+        # In Rails development environment class files are not required before they are needed.
+        #
+        # transpose_hbase_columns_to_record_attributes uses attributes_schema and
+        # for attributes_schema to have loaded all of it's fields correctly we need
+        # to make sure Rails loads class file before attributes_schema renders it's schema.
+        #
+        def transpose_hbase_columns_to_record_attributes(row) # :nodoc:
+          if field = attributes_schema[inheritance_attribute]
+            if cell_with_record_sti_class = row.columns[field.unique_name] and cell_with_record_sti_class.present?
+              if klass = field.decode(cell_with_record_sti_class.value) and klass.present?
+                ensure_sti_class_is_loaded(klass)
+              end
+            end
+          end
 
-        
+          super
+        end
+
+        def ensure_sti_class_is_loaded(klass) # :nodoc:
+          klass.constantize
+        end
       end
 
+
       def ensure_proper_type
-        attr = self.class.inheritance_attribute
+        inheritance_attribute = self.class.inheritance_attribute
 
-        if respond_to?(attr) && self[attr].blank? && self.class.base_class != self.class
-          self[attr] = self.class.to_s
+        if respond_to?(inheritance_attribute) && self[inheritance_attribute].blank? && self.class.base_class != self.class
+          self[inheritance_attribute] = self.class.to_s
         end
       end
     end

data/lib/massive_record/rails/railtie.rb

@@ -4,6 +4,12 @@ module MassiveRecord
       initializer "massive_record.logger" do
         MassiveRecord::ORM::Base.logger = ::Rails.logger
       end
+
+      initializer "massive_record.action_dispatch" do
+        ActiveSupport.on_load :action_controller do
+          ActionDispatch::ShowExceptions.rescue_responses.update('MassiveRecord::ORM::RecordNotFound' => :not_found)
+        end
+      end
     end
   end
 end

data/lib/massive_record/version.rb

@@ -1,3 +1,3 @@
 module MassiveRecord
-  VERSION = "0.2.0.beta2"
+  VERSION = "0.2.0"
 end

data/lib/massive_record/wrapper/base.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'json'
 
 require 'massive_record/wrapper/adapter'
 require 'massive_record/wrapper/errors'
@@ -24,4 +23,4 @@ module MassiveRecord
       
     end  
   end
-end
+end

data/spec/orm/cases/attribute_methods_spec.rb

@@ -28,8 +28,19 @@ describe "attribute methods" do
     @model.read_attribute(:age).should == 15
   end
   
-  it "should contains the id in the attributes getter" do
-    @model.attributes.should include("id")
+  describe "#attributes" do
+    it "should contain the id" do
+      @model.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
+    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'
+    end
   end
 
   describe "#attributes=" do

data/spec/orm/cases/base_spec.rb

@@ -91,6 +91,28 @@ describe MassiveRecord::ORM::Base do
       model.foo.should == 'bar'
     end
 
+    it "should set attributes where nil is not allowed if it is not included in attributes list" do
+      model = TestClass.allocate
+      model.init_with 'attributes' => {:foo => 'bar'}
+      model.hash_not_allow_nil.should == {}
+    end
+
+    it "should set attributes where nil is not allowed if it is included, but the value is nil" do
+      model = TestClass.allocate
+      model.init_with 'attributes' => {:hash_not_allow_nil => nil, :foo => 'bar'}
+      model.hash_not_allow_nil.should == {}
+    end
+
+    it "should not set override attributes where nil is allowed" do
+      model = TestClass.allocate
+      model.init_with 'attributes' => {:foo => nil}
+      model.foo.should be_nil
+    end
+
+    it "should set attributes where nil is not allowed when calling new" do
+      TestClass.new.hash_not_allow_nil.should == {}
+    end
+
     it "should stringify keys set on attributes" do
       model = TestClass.allocate
       model.init_with 'attributes' => {:foo => :bar}
@@ -129,6 +151,24 @@ describe MassiveRecord::ORM::Base do
     end
   end
 
+  describe "intersection and union operation" do
+    it "should correctly find intersection two sets" do
+      ([Person.find(1)] & [Person.find(1), Person.find(2)]).should == [Person.find(1)]
+    end
+
+    it "should correctly find union of two sets" do
+      ([Person.find(1)] | [Person.find(1), Person.find(2)]).should == [Person.find(1), Person.find(2)]
+    end
+
+    it "should correctly find intersection between two sets with different classes" do
+      ([Person.find(1)] & [TestClass.find(1)]).should == []
+    end
+
+    it "should correctly find union between two sets with different classes" do
+      ([Person.find(1)] | [TestClass.find(1)]).should == [Person.find(1), TestClass.find(1)]
+    end
+  end
+
   describe "#to_param" do
     it "should return nil if new record" do
       TestClass.new.to_param.should be_nil

data/spec/orm/models/test_class.rb

@@ -4,5 +4,6 @@ class TestClass < MassiveRecord::ORM::Table
 
   column_family :test_family do
     field :foo, :string
+    field :hash_not_allow_nil, :hash, :allow_nil => false
   end
 end

data/spec/orm/schema/field_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe MassiveRecord::ORM::Schema::Field do
   describe "initializer" do
-    %w(name column default).each do |attr_name|
+    %w(name column default allow_nil).each do |attr_name|
       it "should set #{attr_name}" do
         field = MassiveRecord::ORM::Schema::Field.new attr_name => "a_value"
         field.send(attr_name).should == "a_value"
@@ -16,6 +16,10 @@ describe MassiveRecord::ORM::Schema::Field do
     it "should default to type string" do
       MassiveRecord::ORM::Schema::Field.new(:name => "a_value").type.should == :string
     end
+
+    it "should default allow nil to true" do
+      MassiveRecord::ORM::Schema::Field.new(:name => "a_value").allow_nil.should be_true
+    end
   end
 
   describe "new_with_arguments_from_dsl" do
@@ -292,4 +296,59 @@ describe MassiveRecord::ORM::Schema::Field do
     field = MassiveRecord::ORM::Schema::Field.new :name => "array", :type => :array, :default => default_array
     field.default.object_id.should_not == default_array.object_id
   end
+
+
+  describe "default values" do
+    it "should be able to set to a proc" do
+      subject.type = :string
+      subject.default = Proc.new { "foo" }
+      subject.default.should == "foo"
+    end
+
+    context "when nil is allowed" do
+      MassiveRecord::ORM::Schema::Field::TYPES_DEFAULTS_TO.each do |type, default|
+        default = default.respond_to?(:call) ? default.call : default
+
+        it "should should default to nil" do
+          subject.type = type
+          subject.default.should == nil
+        end
+
+        it "should default to set value" do
+          subject.type = type
+          subject.default = default
+          subject.default.should == default
+        end
+      end
+    end
+
+
+    context "when nil is not allowed" do
+      subject { MassiveRecord::ORM::Schema::Field.new(:name => :test, :allow_nil => false) }
+
+      it { should_not be_allow_nil }
+
+      MassiveRecord::ORM::Schema::Field::TYPES_DEFAULTS_TO.reject { |type| type == :time }.each do |type, default|
+        default = default.respond_to?(:call) ? default.call : default
+
+        it "should default to #{default} when type is #{type}" do
+          subject.type = type
+          subject.default.should == default
+        end
+      end
+
+      it "should default to Time.now when type is time" do
+        subject.type = :time
+        time = Time.now
+        Time.should_receive(:now).and_return(time)
+        subject.default.should == time
+      end
+
+      it "should be possible to override the default nil-not-allowed-value" do
+        subject.type = :hash
+        subject.default = {:foo => :bar}
+        subject.default.should == {:foo => :bar}
+      end
+    end
+  end
 end

data/spec/support/connection_helpers.rb

@@ -43,7 +43,7 @@ module CreatePersonBeforeEach
       
       @row = MassiveRecord::Wrapper::Row.new
       @row.id = "ID1"
-      @row.values = {:info => {:name => "John Doe", :email => "john@base.com", :age => "20"}}
+      @row.values = {:info => {:name => "John Doe", :email => "john@base.com", :age => "20", :test_class_ids => [].to_json}}
       @row.table = @table
       @row.save
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: massive_record
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - beta2
-  version: 0.2.0.beta2
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Companybook
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +02:00
-default_executable: 
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
@@ -26,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
   type: :runtime
   version_requirements: *id001
@@ -41,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -67,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :development
   version_requirements: *id004
@@ -200,7 +182,6 @@ files:
 - spec/wrapper/cases/adapter_spec.rb
 - spec/wrapper/cases/connection_spec.rb
 - spec/wrapper/cases/table_spec.rb
-has_rdoc: true
 homepage: http://github.com/CompanyBook/massive_record
 licenses: []
 
@@ -214,23 +195,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: massive_record
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: HBase Ruby client API