tms_bridge 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGM4YzdjNmQ4MmMyZTNiN2Q5YTZjOTNkMGEzNDk2ZjI4YTMwZGM5OA==
+    MTAzYWNhZDAzOGU1MDMwYWZiNTk1NTZmOTg1Yzg0MGM5MDYyZGQ2Nw==
   data.tar.gz: !binary |-
-    NjA5ZWEwOTZmMDQ3MDg0MDM5OTg2M2E2MTc4ZGI1M2U2NGZlZWI5OQ==
+    ZTY1YzI1YWE1ZGJlMzg4NjI0NGQ3ZTMxNjJkYmUxMDAyNjgyMzAxMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmM2MDRmMjM4MzQ0MTQzNWY0ZWM1YzIxNjE1ZjQ1YjMzYWQxODA2ZDkyNTE2
-    ZTdjYzc2MDhjNWNkYjU1YmMwMzA3NjA3YTljMzY4NzVkODg1YTFkYTQzZmRm
-    YzIzNDY1Y2EyZGViYTdiZjYyYTc4Nzc3N2EzMGQyZGVkZjE2ZTA=
+    YzU1NDE0NTFiZmUxNjkzZjQwOWU3MWNhMWQ5MDk2YmUyNjc3MGJkNTlkOTg1
+    N2FhNDUzZDFkODU5MDUxNWE5ZmQyNWI5MThlY2Y0Y2Q2MGI1OGZiMWEyYjIx
+    MmEyNDFhMzNjOWU0Yjg5MGZiMDJkODUwYjYzNWY1MzkwZTgwMjg=
   data.tar.gz: !binary |-
-    NWQzNWNmY2U4MjY0NzY3ZTIwNmNmMmNiYTZjY2NlMzY5ZmVjZmU0Y2VlM2Vi
-    NWUxZmUyZTRkMjI2NzIyNGQyZTk2M2MzMjY0M2QzNTNiOGY2Yzg2NTIwMDMx
-    ZjNmNDY1MTk0MDhjMDBjODNhYzhmMGFiZGZmMDQ5ODIxYWQwZGM=
+    OGQwYWFiMjlmNTQ4ZGU4OTM1ODdhZWUwOGJjM2RkODZhZjA5YWYxMTBiMTBj
+    ZDZiMGM5ZDIzN2RhZjk2M2Y3NjQ5YzI3M2JlODA1ZDU2YzAyNmU4NmJlYTZk
+    OGE2NGMwNzkyNWE0NWQ0OTA0Njg2MTk1YzdhYTEyNzlkNDgzNjk=

data/.ruby-gemset

@@ -0,0 +1 @@
+tms.bridge

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p545

data/Gemfile.lock

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

data/lib/tms_bridge/controller_support.rb

@@ -42,15 +42,20 @@ RUBY
     end
 
     module Publish
-      def publishes_tms(as, options={:update_only=>false})
+      def publishes_tms(as, options={})
         extend TmsBridge::ControllerSupport::Security unless (class << self; included_modules; end).include?(TmsBridge::ControllerSupport::Security)
         extend TmsBridge::ControllerSupport::Publish::ClassMethods unless (class << self; included_modules; end).include?(TmsBridge::ControllerSupport::Publish::ClassMethods)
         include TmsBridge::ControllerSupport::Publish::InstanceMethods unless included_modules.include?(TmsBridge::ControllerSupport::Publish::InstanceMethods)
 
         self.secure_tms_bridge(as)
-        class_name = self.bridged_resources.classify
         
+        class_name = self.bridged_resources.classify
+
+        options= options.reverse_merge({:update_only=>false, :model_params_key=>self.bridged_resource})
+
         self.update_only = options[:update_only]
+        self.model_params_key =  options[:model_params_key]
+        
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def create
           @#{self.bridged_resource} = #{class_name}.find_by_tms_id(@json['tms_id'])
@@ -60,8 +65,9 @@ RUBY
           end
           
           @#{self.bridged_resource} = #{class_name}.new if @#{self.bridged_resource}.nil? && !self.update_only?
+
           if @#{self.bridged_resource}
-            @#{self.bridged_resource}.attributes = @json['#{self.bridged_resource}'].slice(*#{class_name}.published_attribute_names)
+            @#{self.bridged_resource}.attributes = @json[self.model_params_key.to_s].slice(*#{class_name}.published_attribute_names)
             @#{self.bridged_resource}.save(validate: false)
           end
           render text: 'success'
@@ -74,6 +80,8 @@ RUBY
       module ClassMethods
         def self.extended(base)
           base.class_attribute :update_only
+          base.class_attribute(:model_params_key)
+          
         end
       end
       
@@ -81,6 +89,8 @@ RUBY
         def update_only?
           self.class.update_only
         end
+        
+
       end
 
     end
@@ -91,6 +101,7 @@ RUBY
         include TmsBridge::ControllerSupport::Security::InstanceMethods
         extend TmsBridge::ControllerSupport::Security::ClassMethods
         self.as = as.to_s
+
         self.bridged_resources = self.name.split('::').last.gsub(/Controller/, '').underscore
         self.bridged_resource = self.bridged_resources.singularize
         self.queue_name = self.as + '_'+self.bridged_resources        

data/lib/tms_bridge/version.rb

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

data/spec/iron_cacher_spec.rb

@@ -12,7 +12,7 @@ describe IronCacher do
     end
     
     it "should use a separate config file from the iron.json" do
-      MockIronCache.iron_cache_client.project_id.should == ENV['IRON_CACHE_PROJECT_ID']
+      MockIronCache.iron_cache_client.project_id.should == JSON.parse(File.read("config/iron.json"))['project_id']
     end
 
   end

data/spec/tms_bridge/controller_support_spec.rb

@@ -9,7 +9,7 @@ describe TmsBridge::ControllerSupport::Security do
     extend TmsBridge::ControllerSupport::Security
     secure_tms_bridge :some_client
   end
-  
+
   describe "class attributes" do
     it "should define and set 'as' " do
       SecuritiesController.as.should == 'some_client'
@@ -26,7 +26,7 @@ describe TmsBridge::ControllerSupport::Security do
     it "should define and set 'queue_name' " do
       SecuritiesController.queue_name.should == 'some_client_securities'
     end
-    
+
     it "should add :parse_iron_mq_json to the before_filters" do
       SecuritiesController.before_filters.should include(:parse_iron_mq_json)
     end
@@ -42,36 +42,36 @@ describe TmsBridge::ControllerSupport::Security do
     def controller
       @controller ||= SecuritiesController.new
     end
-    
+
     it "should do something " do
-      controller.json = {'cache_key'=>@cache_key, 'tms_id'=>@tms_id}      
+      controller.json = {'cache_key'=>@cache_key, 'tms_id'=>@tms_id}
       controller.should be_valid_bridge_request
     end
-    
+
     it "should be false if the hash does not match" do
-      controller.json = {'cache_key'=>Digest::SHA2.hexdigest("---#{ENV['CC_BRIDGE_SALT']}--#{@tms_id}--does_not_match--#{IronCacher::CACHE_NAME}--"), 'tms_id'=>@tms_id}      
+      controller.json = {'cache_key'=>Digest::SHA2.hexdigest("---#{ENV['CC_BRIDGE_SALT']}--#{@tms_id}--does_not_match--#{IronCacher::CACHE_NAME}--"), 'tms_id'=>@tms_id}
       controller.should_not be_valid_bridge_request
     end
-    
+
     it "should be false if the cache value is not found" do
       iron_cache(IronCacher::CACHE_NAME).delete(@cache_key)
       controller.should_not be_valid_bridge_request
     end
-  
+
     it "should be false if json is null" do
       iron_cache(IronCacher::CACHE_NAME).delete(@cache_key)
       controller.json = nil
       controller.should_not be_valid_bridge_request
     end
-  
+
     it "should be false if no cache_key was passed" do
       iron_cache(IronCacher::CACHE_NAME).delete(@cache_key)
-      controller.json = {'tms_id'=>@tms_id}      
+      controller.json = {'tms_id'=>@tms_id}
       controller.should_not be_valid_bridge_request
     end
-    
+
   end
-  
+
   describe "parse_iron_mq_json" do
     def controller
       @controller ||= SecuritiesController.new
@@ -82,69 +82,69 @@ describe TmsBridge::ControllerSupport::Security do
       controller.send(:parse_iron_mq_json).should be_nil
       controller.json.class.should eq(Hash)
     end
-    
+
     it "should return false and call head with :ok, if tms_id is not present" do
       controller.request.raw_post= nil
       controller.should_receive(:head).with(:ok)
       controller.send(:parse_iron_mq_json).should == false
     end
-    
+
   end
 end
 
 
 describe TmsBridge::ControllerSupport::Redact do
   include IronCacher
-  
+
   class MockRedactionsController<MockController
     attr_reader :record, :record_class
     extend TmsBridge::ControllerSupport::Redact
     redacts_tms :some_client, %w{MockModel}
   end
-  
+
   def controller
     @controller ||=MockRedactionsController.new
   end
-    
+
   describe "modules" do
     it "should extend security" do
       (class << MockRedactionsController; included_modules; end).should include(TmsBridge::ControllerSupport::Security)
     end
   end
-  
+
   describe "class_methods" do
     it "should assign bridged_resources" do
       MockRedactionsController.bridged_resource_names.should == %w{MockModel}
     end
   end
-  
+
   describe "instance_methods" do
     describe "bridged_resource_class" do
-      
+
       it "should eval the string and return it if the json attribute record_class is in MockRedactionsController.bridged_resource_names" do
         controller.json = {'record_class' => 'MockModel'}
         controller.bridged_resource_class.should == MockModel
       end
-      
+
       it "should return nil if the json attribute a record_class is not in MockRedactionsController.bridged_resource_names" do
         controller.json = {'record_class' => 'raise'}
         controller.bridged_resource_class.should be_nil
       end
     end
   end
-  
+
   describe "create" do
     describe "bridged_resource_class return a class" do
       before(:each) do
         controller.json={'record_class'=>'MockModel', 'tms_id'=>MockModel::FOUND}
         controller.stub(:bridged_resource_class).and_return(MockModel)
       end
-      
+
       it "should call controller#bridged_resource_class" do
         controller.should_receive(:bridged_resource_class)
         controller.create
       end
-      
+
       it "should assign to record class" do
         controller.create
         controller.record_class.should == MockModel
@@ -154,21 +154,22 @@ describe TmsBridge::ControllerSupport::Redact do
         MockModel.should_receive(:find_by_tms_id).with(MockModel::FOUND)
         controller.create
       end
-      
+
       it "should assign to record if found" do
         controller.create
         controller.record.should be_is_a(FoundMockPublishing)
       end
-      
+
       it "should call destroy on the found record" do
         controller.create
         controller.record.called_destroy.should == true
       end
-      
+
       it "should call render" do
         controller.should_receive(:render).with(text: 'success')
         controller.create
       end
+
       it "should not throw an error if the record is not found" do
         controller.json={'record_class'=>'MockModel', 'tms_id'=>MockModel::NOT_FOUND}
         controller.record.should be_nil
@@ -191,7 +192,7 @@ describe TmsBridge::ControllerSupport::Redact do
 end
 
 describe TmsBridge::ControllerSupport::Publish do
-  
+
   class MockPublishingsController<MockController
     attr_reader :mock_publishing
 
@@ -207,12 +208,62 @@ describe TmsBridge::ControllerSupport::Publish do
     it "should extend security" do
       (class << MockPublishingsController; included_modules; end).should include(TmsBridge::ControllerSupport::Security)
     end
-    
+
     it "should support update_only?" do
       controller.update_only?.should == controller.class.update_only
     end
+
   end
 
+  def widget_controller(params={})
+    Class.new do
+      extend TmsBridge::ControllerSupport::Publish
+      def self.before_filter(*args)
+      end
+      def self.name
+        "WidgetsController"
+      end
+      publishes_tms :some_client, params
+    end
+
+  end
+
+  describe "class_methods" do
+
+    it "should set update_only to false by default" do
+      widget_controller.update_only.should == false
+    end
+
+    it "should support manually setting update_only" do
+      widget_controller(:update_only=>true).update_only.should == true
+    end
+
+    it "should support setting model_params_key" do
+      widget_controller(:model_params_key=>'something_else').model_params_key.should == 'something_else'
+    end
+
+    it "should set model_params_key to bridged_resource by default" do
+      widget_controller.model_params_key.should == widget_controller.bridged_resource
+    end
+
+  end
+
+  describe "instance_methods" do
+
+    it "should return the value of class's update_only for update_only?" do
+      controller = widget_controller
+      controller.should_receive(:update_only){true}
+      controller.new.update_only?
+    end
+
+    it "should return the value of the class's model_params_key" do
+      controller = widget_controller
+      controller.should_receive(:model_params_key)
+      controller.new.model_params_key
+
+    end
+  end
+  
   describe "create" do
     before(:each) do
       @attributes = {'some_key'=>'some value'}
@@ -220,17 +271,17 @@ describe TmsBridge::ControllerSupport::Publish do
       @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
       controller.create
       controller.mock_publishing.should_not be_nil
     end
-    
+
     it "should assign to attributes" do
       controller.create
       controller.mock_publishing.attributes.should == @attributes
     end
-    
+
     it "it should call MockPublishing.find_by_tms_id" do
       MockPublishing.should_receive(:find_by_tms_id).with(@tms_id)
       controller.create
@@ -240,41 +291,41 @@ describe TmsBridge::ControllerSupport::Publish do
       MockPublishing.should_receive(:new)
       controller.create
     end
-    
+
     it "should not pass attributes to the mock model taht are not supported" do
       MockPublishing.should_receive(:published_attribute_names){['some_key']}
       controller.create
     end
-    
+
     it "it should call MockPublishing.new if MockPublishing.find_by_tms_id returns nothing" do
-      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>MockPublishing::NOT_FOUND}      
+      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>MockPublishing::NOT_FOUND}
       MockPublishing.should_receive(:new)
       controller.create
     end
-    
+
     it "it should call MockPublishing.new if MockPublishing.find_by_tms_id returns nothing and update_only? == true" do
-      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>MockPublishing::NOT_FOUND}      
+      controller.json = {'mock_publishing'=>@attributes, 'tms_id'=>MockPublishing::NOT_FOUND}
       MockPublishing.should_not_receive(:new)
       controller.stub(:update_only?){true}
       controller.create
     end
-    
+
     it "should call save on the mock_publishing model" do
       controller.create
       controller.mock_publishing.called_save.should == true
     end
-    
+
     it "should call render " do
       controller.should_receive(:render).with(text: 'success')
       controller.create
     end
-    
+
     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      
+      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
@@ -283,8 +334,19 @@ describe TmsBridge::ControllerSupport::Publish do
       MockPublishing.stub(:column_names){column_names}
       MockPublishing.should_not_receive(:find_by_bridge_id).with(@bridge_id)
       controller.json['bridge_id'] = nil
-      controller.create      
+      controller.create
+    end
+
+    it "should set the attributes according to model_params_key" do
+      @attributes = {'some_key'=>'value'}
+
+      controller.json={'record_class'=>'MockModel', 'tms_id'=>MockModel::FOUND, 'some_model'=>@attributes}
+      controller.should_receive(:model_params_key).and_return('some_model')
+      controller.create
+      controller.mock_publishing.should be_is_a(FoundMockPublishing)
+      controller.mock_publishing.attributes.should == @attributes
     end
     
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tms_bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Erich Timkar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ''

data/.rvmrc

@@ -1,7 +0,0 @@
-export DYLD_LIBRARY_PATH="/usr/local/mysql/lib:$DYLD_LIBRARY_PATH"
-export RUBYOPT=-Ku
-export IRON_CACHE_TOKEN="6P0Hr8umXZruKzS3SbKF1vuu1E8"
-export IRON_CACHE_PROJECT_ID="50a79df0a6498073e700560c"
-export CC_BRIDGE_SALT="c7b5fae1-d719-4c8e-b92b-1c4c5e26ca10"
-
-rvm --create use 1.9.3@tms.bridge > /dev/null