couchbase-model-relationship 0.1.11 → 0.1.12.jm

data/couchbase-model-relationship.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemodel', '~> 3'
   spec.add_dependency 'activesupport', '~> 3'
-  spec.add_dependency 'couchbase', '~> 1'
-  spec.add_dependency 'couchbase-model', '~> 0.5.3'
+  spec.add_dependency 'jmoses-couchbase', '~> 1'
+  spec.add_dependency 'jmoses-couchbase-model', '~> 0.5.3'
   spec.add_dependency 'json', '~> 1.8.0'
   # FIXME Remove when couchbase is > 1.3.1
   spec.add_dependency 'multi_json', '1.7.5'

data/lib/couchbase/model/dirty.rb

@@ -11,6 +11,7 @@ module Couchbase
 
         alias_method_chain :save, :dirty
         alias_method_chain :create, :dirty
+        alias_method_chain :update_attributes, :dirty
 
         attribute_method_prefix :previous_
 
@@ -26,10 +27,11 @@ module Couchbase
             Array(results).each {|instance| instance.send :clean! }
           end
         end
+
       end
 
       def write_attribute(name, value)
-        send "#{name}_will_change!" unless send(name) == value
+        send "#{name}_will_change!" unless @_ignore_dirty || send(name) == value
 
         @_attributes[name] = value
       end
@@ -45,6 +47,16 @@ module Couchbase
         self
       end
 
+      def update_attributes_with_dirty(attrs)
+        begin
+          @_ignore_dirty = attrs.delete(:_ignore_dirty)
+
+          update_attributes_without_dirty(attrs)
+        ensure
+          @_ignore_dirty = false
+        end
+      end
+
       def save_with_dirty(options = {})
         save_without_dirty(options).tap do |value|
           capture_previous_changes if value

data/lib/couchbase/model/id_prefix.rb

@@ -29,7 +29,7 @@ module Couchbase
         # FIXME Need to handle cases where there's no id, or we fail or 
         # w/e
         def id_prefix
-          name.underscore
+          @_id_prefix ||= name.underscore
         end
 
         def next_prefixed_id

data/lib/couchbase/model/relationship/parent.rb

@@ -219,10 +219,13 @@ module Couchbase
 
           def raw_new(id, results)
             obj, flags, cas = results
-            obj = {:raw => obj} unless obj.is_a?(Hash)
-            new({:id => id, :meta => {'flags' => flags, 'cas' => cas}}.merge(obj)).tap do |instance|
-              instance.send :clean!
+            if obj.is_a?(Hash)
+              obj.merge!(:_ignore_dirty => true)
+            else
+              obj = {:raw => obj}
             end
+
+            new({:id => id, :meta => {'flags' => flags, 'cas' => cas}}.merge(obj))
           end
         end
       end

data/lib/couchbase/model/relationship/version.rb

@@ -1,7 +1,7 @@
 module Couchbase
   class Model
     module Relationship
-      VERSION = "0.1.11"
+      VERSION = "0.1.12.jm"
     end
   end
 end

data/spec/deep_copier_spec.rb

@@ -53,4 +53,6 @@ describe Couchbase::Model::DeepCopier do
     source.should_not eq(copy)
     copy.should eq({key: []})
   end
+
+
 end

data/spec/dirty_spec.rb

@@ -8,6 +8,22 @@ end
 describe "Dirty" do
   subject { DirtyTest.new }
 
+  describe "#update_attributes" do
+    it "doesn't mark dirty if ignoring" do
+      subject.update_attributes :_ignore_dirty => true, :name => 'abc'
+
+      subject.name.should eq('abc')
+      subject.should_not be_name_changed
+    end
+
+    it "marks dirty if not ignoring" do
+      subject.update_attributes :name => 'abc'
+
+      subject.name.should eq('abc')
+      subject.should be_name_changed
+    end
+  end
+
   it "should mark the fields as dirty" do
     subject.name = 'abc'
     subject.should be_name_changed

data/spec/id_prefix_spec.rb

@@ -16,6 +16,21 @@ describe "IdPrefix" do
     subject.class.id_prefix.should eq("id_prefix_test")
   end
 
+  it "caches the prefix" do
+    subject.class.instance_variable_set(:@_id_prefix, nil)
+    subject.class.id_prefix
+    subject.class.instance_variable_get(:@_id_prefix).should eq('id_prefix_test')
+  end
+
+  it "reads from the prefix cache" do
+    subject.class.instance_variable_set(:@_id_prefix, 'abc')
+    String.any_instance.expects(:underscore).never
+    subject.class.id_prefix.should eq('abc')
+
+    # Resetting
+    subject.class.instance_variable_set(:@_id_prefix, nil)
+  end
+
   it "prefixes an id properly" do
     subject.class.prefixed_id(123).should eq("id_prefix_test:123")
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-model-relationship
 version: !ruby/object:Gem::Version
-  version: 0.1.11
-  prerelease: 
+  version: 0.1.12.jm
+  prerelease: 7
 platform: ruby
 authors:
 - Jon Moses
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: couchbase
+  name: jmoses-couchbase
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: couchbase-model
+  name: jmoses-couchbase-model
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -216,18 +216,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 977357591952759392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 977357591952759392
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24