orchestrate-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a5bf3c95eed7c945ba37051d9993fab5f45266
-  data.tar.gz: bb3f294d24c43b41425469a7c899fb3a24a0a024
+  metadata.gz: 166db9c90bebd699191f15f953f5d75ed798f949
+  data.tar.gz: 76817436a532fc83e62b27da2783fec7480f70f8
 SHA512:
-  metadata.gz: 132574ad45f7a4cefb3936bc0fcfcebcc8fd6869e170d8ea10f3d06baacee79dd8d048d31be480f6916cf757059f626e0558630518f64e916c2eb59d556f9ab1
-  data.tar.gz: 613cfd0eaf2fe8ed9be89bd9562be28625a0e7b84f046ec5e603dc2601cbb10c78947e29ce88aeff037eb64dc875584e5498e41eaa5994a08c7f18a8894c224a
+  metadata.gz: d21e092deb79e7fd79b30fcb1b43cc31eda1a9d4d0c7f63697c08149e7afca9fc0690649d1d6fbfb5645bbf7f5671713e3df07e3cc5fcd99dd972a84d94da5d2
+  data.tar.gz: 7a66f5c71d6298d64f368ef1a6e219f6cb9ba6ae67aa2a36901b49eee8aab32ac1944ba5147146f2b78f2dbc8cf9fd159c25d82612bed84f220ded4336607738

data/lib/orchestrate_application/record.rb

@@ -22,7 +22,7 @@ module Orchestrate::Application
     # attr_reader :event_types, :graphs
 
     # :stopdoc:
-    # The <tt>ref</tt> value for the current instance.
+    # The <b>ref</b> value for the current instance.
     # Convenience method #orchestrate_ref_value is provided as the
     # recommended way for an application to read this attribute.
     attr_reader :__ref_value__
@@ -236,7 +236,7 @@ module Orchestrate::Application
       )
     end
 
-    def orchio_put_event(event_type, timestamp={}, document)
+    def orchio_put_event(event_type, timestamp=nil, document)
       # add_event_type event_type
       response = client.send_request(:put, inst_args(
         event_type: event_type, timestamp: timestamp, json: document
@@ -318,8 +318,8 @@ module Orchestrate::Application
       ocollection
     end
 
-    # Returns the <tt>ref</tt> value for the current instance.
-    # The <tt>ref</tt> value is an immutable value assigned to each
+    # Returns the <b>ref</b> value for the current instance.
+    # The <b>ref</b> value is an immutable value assigned to each
     # version of primary_key data in an orchestrate.io collection.
     def orchestrate_ref_value
       __ref_value__
@@ -341,7 +341,7 @@ module Orchestrate::Application
       # Returns the collection name for this instance.
       #
       # This method is called during initializtion with the value
-      # of <tt>:define_collection_name</tt> from the params hash.
+      # of <b>:define_collection_name</b> from the params hash.
       # If this value is nil or blank, it is expected that the collection
       # name can be derived from the class name as shown:
       #
@@ -349,7 +349,7 @@ module Orchestrate::Application
       # - class: FilmClassic => 'film_classics'
       #
       # Any collection names that do not follow this convention must be
-      # specified by adding the <tt>:define_collection_name</tt> key to
+      # specified by adding the <b>:define_collection_name</b> key to
       # the params hash in the model class definition.
       #
       #  class Film < Orchestrate::Application::Record
@@ -364,11 +364,34 @@ module Orchestrate::Application
                                  : collection_name
       end
 
-      # Updates the current instance's <tt>ref</tt> value, aka <tt>etag</tt>,
-      # after a successful PUT request.
+      # After a successful PUT request,
+      # updates the current instance's <b>ref</b> value (also referred to
+      # as the <b>etag</b>)
+      # and calls #orchio_update_ref_table.
       def set_ref_value(response)
         unless response.header.code != 201 || response.header.etag.blank?
           @__ref_value__ = response.header.etag
+          # orchio_update_ref_table response.header.timestamp
+        end
+      end
+
+      # Updates the <b>ref table</b> collection with key/value data consisting
+      # of the current instance's <em><b>collection, key, timestamp</b> and
+      # <b>ref</b> values </em>, using the ref value as the primary key.
+      # When the ref table feature is enabled, the ref table is
+      # updated after each sucessful <b>put_key</b> request.
+      def orchio_update_ref_table(timestamp)
+        return if ocollection == RefTable.get_collection_name
+
+        if RefTable.enabled?
+          primary_key = __ref_value__.gsub(/"/, '')
+          doc = {
+            xcollection: ocollection,
+            xkey:        id,
+            xref:        primary_key,
+            timestamp:   timestamp
+          }.to_json
+          RefTable.new(:id => primary_key).orchio_put doc
         end
       end
 
@@ -453,7 +476,7 @@ module Orchestrate::Application
       def self.orchio_status(response, expected_code)
         # puts "        orchio_status: '#{response.header.code}'"
         status = true
-        if response.header.code != expected_code
+        if response.header.code.to_i != expected_code
           puts "        Error: #{response.body.code}: \"#{response.body.message}\""
           status = false
         end

data/lib/orchestrate_application/ref_table.rb

@@ -0,0 +1,35 @@
+module Orchestrate::Application
+
+  class RefTable < Orchestrate::Application::Record
+
+    @@is_enabled = false
+    @@collection_name = 'orchio_ref_table'
+
+    def initialize(params={})
+      return unless @@is_enabled == true
+      params[:define_collection_name] = @@collection_name
+      super params
+    end
+
+    def self.enable(name = nil)
+      puts "ENABLE REF TABLE"
+      @@is_enabled = true
+      @@collection_name = name unless name.blank?
+      Orchestrate::Application::Schema.instance.define_collection(
+        :name       => @@collection_name,
+        :properties => [ :xcollection, :xkey, :timestamp, :xref]
+      )
+    end
+
+    def self.enabled?
+      @@is_enabled == true
+    end
+
+    def self.get_collection_name
+      @@collection_name
+    end
+
+  end
+
+end
+

data/lib/orchestrate_application/simple_cache_response.rb

@@ -2,7 +2,7 @@ module Orchestrate::Application
 
   # ---------------------------------------------------------------------------
   #  Class to handle Orchestrate.io API responses
-  # 
+  #
   class SimpleCacheResponse
     attr_accessor :header, :body
 
@@ -10,13 +10,18 @@ module Orchestrate::Application
       @header, @body = Header.new(header), Body.new(body)
     end
 
+    def success?
+      true
+    end
+
     class Header
-      attr_reader :locations, :code, :status, :etag
+      attr_reader :locations, :code, :status, :etag, :content
 
       def initialize(header)
         @locations = header[:locations]
         @code, @status = header[:code], header[:status]
         @etag = header[:etag]
+        @content = {}
       end
 
       def location
@@ -25,10 +30,12 @@ module Orchestrate::Application
     end
 
     class Body
-      attr_reader :documents
-      
+      attr_reader :documents, :count, :content
+
       def initialize(body)
         @documents = body
+        @count = documents.length
+        @content = nil
       end
 
       def document

data/lib/orchestrate_application/simple_cache_store.rb

@@ -148,9 +148,9 @@ module Orchestrate::Application
     end
 
     def self.enable
-      # puts "SC-ENABLE"
-      # @@is_enabled = true
-      puts "SIMPLE-CACHE has been DISABLED for the current version."
+      puts "SC-ENABLE"
+      @@is_enabled = true
+      # puts "SIMPLE-CACHE has been DISABLED for the current version."
     end
 
     def self.disable

data/lib/orchestrate_rails/model.rb

@@ -8,6 +8,9 @@ module Orchestrate::Rails
   #
   class Model < Orchestrate::Application::Record
     include ::ActiveModel::Validations
+    include ::ActiveModel::Serialization
+    include ::ActiveModel::Serializers
+    include ::ActiveModel::Serializers::JSON
     include ::ActiveModel::Conversion
     extend ::ActiveModel::Naming
 
@@ -38,6 +41,16 @@ module Orchestrate::Rails
       end
     end
 
+    # Called by ActiveModel::Validation
+    def read_attribute_for_validation(attribute)
+      instance_variable_get("@#{attribute}")
+    end
+
+    # Called by ActiveModel::Serialization
+    def read_attribute_for_serialization(attribute)
+      instance_variable_get("@#{attribute}")
+    end
+
     # -------------------------------------------------------------------------
     # Instance methods
 
@@ -49,8 +62,6 @@ module Orchestrate::Rails
     # Returns hash of key/value pairs.
     def attributes
       @attributes = Hash[attrs.map { |a| [a.to_sym, send("#{a}")] }]
-      # @attributes =
-      #   Hash[attrs.map { |a| [a.to_sym, instance_variable_get("@#{a}")] }]
     end
 
     # :stopdoc:
@@ -159,7 +170,7 @@ module Orchestrate::Rails
     end
     # :startdoc:
 
-    # Deletes the current primary_key from the collection.
+    # Deletes the current primary_key from the collection. Calls #orchio_delete
     #
     # Returns boolean status.
     def destroy
@@ -224,7 +235,7 @@ module Orchestrate::Rails
     #
     # Returns boolean status.
     def save_graph(kind, to_collection, to_key)
-      retval orchio_put_graph kind, to_collection, to_key
+      retval orchio_put_graph(kind, to_collection, to_key)
     end
 
     # Removes the specified relation from the graph.
@@ -293,7 +304,7 @@ module Orchestrate::Rails
     # ::String#to_orchio_rails_attr.
     #
     def self.properties
-      schema.properties ocollection
+      schema.properties(ocollection).select { |prop| prop !~ /id/i }
     end
 
     # -------------------------------------------------------------------------
@@ -395,7 +406,7 @@ module Orchestrate::Rails
     def self.find_by_method(myattrs, *args, &block)
       attrs_with_args = [myattrs.split('_and_'), args].transpose
       attrs_with_args.each { |awa| return unless attrs.include? awa.first }
-      find_by Hash[attr_with_args]
+      find_by Hash[attrs_with_args]
     end
 
     # Calls ::find_by_method for 'find_by_attribute(s)'.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestrate-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Carrasquer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orchestrate-api
@@ -36,6 +36,7 @@ files:
 - lib/orchestrate_application/connect.rb
 - lib/orchestrate_application/record.rb
 - lib/orchestrate_application/document.rb
+- lib/orchestrate_application/ref_table.rb
 - lib/orchestrate_application/result.rb
 - lib/orchestrate_application/response.rb
 - lib/orchestrate_application/simple_cache_store.rb