tms_bridge 0.1 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDhkZTljM2VlM2FhM2Y0N2EwYWJkNTdkYjIzMThlZDhkNzVmOGJmOQ==
+    ZGM4YzdjNmQ4MmMyZTNiN2Q5YTZjOTNkMGEzNDk2ZjI4YTMwZGM5OA==
   data.tar.gz: !binary |-
-    NjEyNjFlYWIzY2RlNDllZDJjYWQxZWM0YThkNWQxMTgwZTVkMzIxNQ==
+    NjA5ZWEwOTZmMDQ3MDg0MDM5OTg2M2E2MTc4ZGI1M2U2NGZlZWI5OQ==
 SHA512:
   metadata.gz: !binary |-
-    NmQ3NzhmNzMyODM1OTEzNTdmYThmYWJiOTM1ZWViYTNlYzY5YzQxM2M0NTE3
-    ODI0ZTFmZmI1YjZiYjBkODEwMGY3MTkwNjU2MzdkZTkzYjIyY2ZiMmZhNWVl
-    NjIxMzIwMzA1ZmI4ZTRiM2Y5MjAxMTY5MGNmZjI3NGJlMGYzOGI=
+    ZmM2MDRmMjM4MzQ0MTQzNWY0ZWM1YzIxNjE1ZjQ1YjMzYWQxODA2ZDkyNTE2
+    ZTdjYzc2MDhjNWNkYjU1YmMwMzA3NjA3YTljMzY4NzVkODg1YTFkYTQzZmRm
+    YzIzNDY1Y2EyZGViYTdiZjYyYTc4Nzc3N2EzMGQyZGVkZjE2ZTA=
   data.tar.gz: !binary |-
-    YTRiMDgxNWM4MDU2MDVhYjVhNTg2ZDBlMGExNTMyM2Y4ODdmZWQyZDRhNDgy
-    YjcyZmFhMjA4MGE0N2Q4NGRhMWY4ZTZhMjExZmM3MGFlYmE1NDcxNTNkZjZl
-    MjIwYjMwNjYzMjFjMmQ5N2MyODJlMzYyMGE3OTBkNDIwMGVkMGY=
+    NWQzNWNmY2U4MjY0NzY3ZTIwNmNmMmNiYTZjY2NlMzY5ZmVjZmU0Y2VlM2Vi
+    NWUxZmUyZTRkMjI2NzIyNGQyZTk2M2MzMjY0M2QzNTNiOGY2Yzg2NTIwMDMx
+    ZjNmNDY1MTk0MDhjMDBjODNhYzhmMGFiZGZmMDQ5ODIxYWQwZGM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tms_bridge (0.1)
+    tms_bridge (0.1.1)
       actionpack (>= 3.2.0)
       activerecord (>= 3.2.0)
       iron_cache

data/lib/tms_bridge/controller_support.rb

@@ -53,7 +53,11 @@ RUBY
         self.update_only = options[:update_only]
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def create
-          @#{self.bridged_resource} = block_given? ? yield(#{class_name}, @json) : #{class_name}.find_by_tms_id(@json['tms_id']) 
+          @#{self.bridged_resource} = #{class_name}.find_by_tms_id(@json['tms_id'])
+          
+          if @#{self.bridged_resource}.nil? && #{class_name}.column_names.include?('bridge_id') && !@json['bridge_id'].blank?
+            @#{self.bridged_resource} = #{class_name}.find_by_bridge_id(@json['bridge_id']) 
+          end
           
           @#{self.bridged_resource} = #{class_name}.new if @#{self.bridged_resource}.nil? && !self.update_only?
           if @#{self.bridged_resource}

data/lib/tms_bridge/version.rb

@@ -1,3 +1,3 @@
 module Bridge
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/spec/tms_bridge/controller_support_spec.rb

@@ -217,7 +217,8 @@ describe TmsBridge::ControllerSupport::Publish do
     before(:each) do
       @attributes = {'some_key'=>'some value'}
       @tms_id = MockPublishing::NOT_FOUND
-      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>@tms_id}
+      @bridge_id = 'somebridgeid'
+      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>@tms_id, 'bridge_id'=>@bridge_id}
     end
     
     it "should assign to the mock_publishing attribute" do
@@ -241,7 +242,6 @@ describe TmsBridge::ControllerSupport::Publish do
     end
     
     it "should not pass attributes to the mock model taht are not supported" do
-      puts MockPublishing.published_attribute_names
       MockPublishing.should_receive(:published_attribute_names){['some_key']}
       controller.create
     end
@@ -269,13 +269,21 @@ describe TmsBridge::ControllerSupport::Publish do
       controller.create
     end
     
-    it "should yield to find a model if block_given?" do
-      yielded = false
-      controller.create{
-        yielded = true
-        nil
-      }
-      yielded.should == true
+    it "should attempt a lookup of the model with bridge_id if not found by tms_id an supports bridge_id" do
+      MockPublishing.should_receive(:find_by_tms_id).with(@tms_id){nil}
+      column_names = MockPublishing.column_names + ['bridge_id']
+      MockPublishing.stub(:column_names){column_names}
+      MockPublishing.should_receive(:find_by_bridge_id).with(@bridge_id)
+      controller.create      
+    end
+
+    it "should attempt a lookup of the model with bridge_id if not found by tms_id an supports bridge_id, but bridge_id is blank" do
+      MockPublishing.should_receive(:find_by_tms_id).with(@tms_id){nil}
+      column_names = MockPublishing.column_names + ['bridge_id']
+      MockPublishing.stub(:column_names){column_names}
+      MockPublishing.should_not_receive(:find_by_bridge_id).with(@bridge_id)
+      controller.json['bridge_id'] = nil
+      controller.create      
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tms_bridge
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Erich Timkar