cru_lib 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8f38e8b4e257661870015c17629990db58161d
-  data.tar.gz: 9998e4d8a67bb11c536e7b4cbc7c2ac6282c6fc9
+  metadata.gz: d936cc7dc3e60b9974dc18f658c65105ace08cd6
+  data.tar.gz: 908ce243da74e7f5ca825079e5c13574f9a485d4
 SHA512:
-  metadata.gz: af8bb684ad41e2666550aef5042653c4fec652146d47d9a40eff77187c7f2123fc6a0ef8e5917e56f44342ed16c878c2a92848c9e7f764917ef4f7c33d529745
-  data.tar.gz: 75a86c8d69ed9fb4dbb0453f425ceffc13b5d943bebdc4d1dd00dc4d0bbd79b1d13f6e4dbe378f9c7ce64526a4a9da0dd91a19f9e0176b29bb42f479b733212f
+  metadata.gz: 905a67249419b9ff92a0badc0b27f868fce3de6d65c40f625092dd650adf1d42e06d4ee37db163293868a89aad208a90689678129db5f6b6aee8ab655fb576c0
+  data.tar.gz: f9b90db5152e55630b8d7cdac145a33236043b8622c0e54b08818e1b8b7979914297febfce977744cf20f818ca23d5545f2cd797761283ce384689b6f0bd65a7

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.idea

data/cru_lib.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.add_dependency "global_registry"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/cru_lib/global_registry_methods.rb

@@ -23,17 +23,18 @@ module CruLib
       async(:async_push_to_global_registry)
     end
 
-    def async_push_to_global_registry(parent_id = nil, parent_type = nil)
+    def async_push_to_global_registry(parent_id = nil, parent_type = nil, parent = nil)
       self.class.push_structure_to_global_registry
 
       if global_registry_id
         begin
-          update_in_global_registry(parent_id, parent_type)
+          update_in_global_registry(parent_id, parent_type, parent)
         rescue RestClient::ResourceNotFound
-          create_in_global_registry(parent_id, parent_type)
+          self.global_registry_id = nil
+          async_push_to_global_registry
         end
       else
-        create_in_global_registry(parent_id, parent_type)
+        create_in_global_registry(parent_id, parent_type, parent)
       end
     end
 
@@ -42,24 +43,24 @@ module CruLib
         @attributes_to_push = {}
         attributes_to_push['client_integration_id'] = id unless self.class.skip_fields_for_gr.include?('client_integration_id')
         attributes_to_push['client_updated_at'] = updated_at if respond_to?(:updated_at)
-        attributes.collect {|k, v| @attributes_to_push[k.underscore] = v}
+        attributes.collect {|k, v| @attributes_to_push[k.underscore] = self.class.gr_value(k.underscore, v)}
         @attributes_to_push.select! {|k, v| v.present? && !self.class.skip_fields_for_gr.include?(k)}
       end
       @attributes_to_push
     end
 
-    def update_in_global_registry(parent_id = nil, parent_type = nil)
+    def update_in_global_registry(parent_id = nil, parent_type = nil, parent = nil)
       if parent_type
-        create_in_global_registry(parent_id, parent_type)
+        create_in_global_registry(parent_id, parent_type, parent)
       else
         GlobalRegistry::Entity.put(global_registry_id, {entity: attributes_to_push})
       end
     end
 
-    def create_in_global_registry(parent_id = nil, parent_type = nil)
+    def create_in_global_registry(parent_id = nil, parent_type = nil, parent = nil)
       entity_attributes = { self.class.global_registry_entity_type_name => attributes_to_push }
       if parent_type.present?
-        entity_attributes = {parent_type => entity_attributes}
+        entity_attributes = {parent_type => entity_attributes.merge(client_integration_id: parent.id)}
         GlobalRegistry::Entity.put(parent_id, {entity: entity_attributes})
       else
         entity = GlobalRegistry::Entity.post(entity: entity_attributes)
@@ -69,6 +70,22 @@ module CruLib
     end
 
     module ClassMethods
+      def gr_value(column_name, value)
+        return value if value.blank?
+
+        column = columns_to_push.detect { |c| c[:name] == column_name }
+        return unless column
+
+        case column[:field_type].to_s
+        when 'datetime', 'date'
+          value.to_s(:db)
+        when 'boolean'
+          value ? 'true' : 'false'
+        else
+          value.to_s.strip
+        end
+      end
+
       def push_structure_to_global_registry(parent_id = nil)
         # Make sure all columns exist
         entity_type = Rails.cache.fetch(global_registry_entity_type_name, expires_in: 1.hour) do
@@ -94,7 +111,7 @@ module CruLib
         @columns_to_push ||= columns.select { |c|
           !skip_fields_for_gr.include?(c.name.underscore)
         }.collect {|c|
-          { name: c.name.underscore, type: normalize_column_type(c.type, c.name.underscore) }
+          { name: c.name.underscore, field_type: normalize_column_type(c.type, c.name.underscore) }
         }
       end
 

data/lib/cru_lib/global_registry_relationship_methods.rb

@@ -17,7 +17,7 @@ module CruLib
     # @param [String] relationship_name
     # @param [String] related_name
     # @param [Object] related_object
-    def attributes_to_push(relationship_name = nil, related_name = nil, related_object = nil)
+    def attributes_to_push(relationship_name: nil, related_name: nil, related_object: nil, base_object: nil)
       if global_registry_id
         attributes_to_push = super
         attributes_to_push
@@ -26,7 +26,8 @@ module CruLib
           "#{relationship_name}:relationship" => {
             client_integration_id: id,
             related_name => related_object.global_registry_id
-          }
+          },
+          client_integration_id: base_object.id
         }
       end
     end
@@ -36,7 +37,7 @@ module CruLib
     def create_in_global_registry(base_object, relationship_name)
       entity = GlobalRegistry::Entity.put(
         base_object.global_registry_id,
-        entity: {base_object.class.global_registry_entity_type_name => attributes_to_push}
+        entity: { base_object.class.global_registry_entity_type_name => attributes_to_push(base_object: base_object) }
       )
 
       base_object_id = entity['entity'][base_object.class.global_registry_entity_type_name]['id']

data/lib/cru_lib/version.rb

@@ -1,3 +1,3 @@
 module CruLib
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/shared_examples_for_global_registry_models.rb

@@ -0,0 +1,28 @@
+# To include some tests for global_registry_methods automatically, copy this file to 
+# spec/support/shared_examples_for_global_registry_models.rb in the enclosing app then 
+# add include_examples "global_registry_methods" to the enclosing spec
+#
+# for example:
+#
+# RSpec.describe Address, :type => :model do
+#   include_examples "global_registry_methods"
+# end
+#
+# there should be some lines in your spec_helper.rb like this:
+#
+#   # Requires supporting ruby files with custom matchers and macros, etc,
+#   # in spec/support/ and its subdirectories.
+#   Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+#
+# that will automatically include the file once it's copied to spec/support
+#
+shared_examples "global_registry_methods" do
+  context "self.skip_fields_for_gr" do
+    it "should run" do
+      expect(described_class.skip_fields_for_gr.class).to eq(Array), "Expected #{described_class}.skip_fields_for_gr to return an Array"
+      expect(described_class.skip_fields_for_gr.collect(&:class).uniq).to eq([String]), "Expected #{described_class}.skip_fields_for_gr to return an Array of Strings"
+      expect(described_class.skip_fields_for_gr.uniq).to eq(described_class.skip_fields_for_gr), "Expected #{described_class}.skip_fields_for_gr to return an Array with no duplicates (#{described_class.skip_fields_for_gr.find_all{ |c| described_class.skip_fields_for_gr.count(c) > 1 }.uniq} are all in the array at least twice)"
+      expect(described_class.skip_fields_for_gr - described_class.column_names - described_class.attribute_aliases.keys).to be_empty, "Expected #{described_class}.skip_fields_for_gr to return an Array of Strings where each string is a column or attribute alias (#{described_class.skip_fields_for_gr - described_class.column_names - described_class.attribute_aliases.keys} are not columns or attribute aliases)"
+    end
+  end
+end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cru_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josh Starcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: global_registry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Collection of common ruby logic used by a number of Cru apps
@@ -45,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -56,6 +70,7 @@ files:
 - lib/cru_lib/global_registry_methods.rb
 - lib/cru_lib/global_registry_relationship_methods.rb
 - lib/cru_lib/version.rb
+- spec/shared_examples_for_global_registry_models.rb
 homepage: ''
 licenses:
 - MIT
@@ -66,18 +81,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Misc libraries for Cru
-test_files: []
+test_files:
+- spec/shared_examples_for_global_registry_models.rb