boxxspring 2.0.16 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3dfdb7b50d621bdf111ee92ab7724bb5d2ab4cb
-  data.tar.gz: cd5084cb457165b2041bcb96b04c2764c3550c17
+  metadata.gz: 0be8421b40d41130cfeda34c01efff834418a751
+  data.tar.gz: b148bf88e23a44832b3c2b36200ebd068c448ff4
 SHA512:
-  metadata.gz: 6b61cba0d1e031159b0b80e5fbbddbf7417fb11e6bad14c1ff742b7a708c050dbdbcd277e2ca849633f243b95d77f1b34d734a9ff4b48f7c6a3ef12a82bb3d81
-  data.tar.gz: 9e4fe19be37a24b5c2333314b86b1892d4672e0fc98a92059625ae33f628ed6d97f128d697bcd45e20f15301f57d92fbe4c5f3ec525cb4312c74f74f8f796c60
+  metadata.gz: 6358f4752f69b684fac237514a8f9a3b7d5723800c70f14afa880d511b551598ab1c122771b89faa9ecc59d376795ba4cce99c9a6e8a5248d70dcd5479d03185
+  data.tar.gz: 9517160038a589139d486f1c4159df02b817bc623c06dd586d83e09115b384980519673cc9d8f9a880a4d023f563e6c8d8d9ad78016ba458db6b623d8d1c22a4

data/lib/boxxspring/configuration.rb

@@ -32,8 +32,8 @@ module Boxxspring
       )
     end
 
-    # the api uri
-    define_attribute :api_uri,      default: 'http://api-staging.bedrocketplatform.com/'
+    # the api uri; DO NOT COMMIT A MODIFIED DEFAULT
+    define_attribute :api_uri,      default: 'https://api.boxxspring.com'
   
     def from_hash( configuration )
   

data/lib/boxxspring/operation.rb

@@ -31,8 +31,7 @@ module Boxxspring
       result = nil
       Boxxspring::Request.new.tap do | request |
         request.get( @path, @parameters ).tap do | response |
-          parser = Boxxspring::Parser.new( response.content )
-          result = parser.resources
+          result = response.resources
           result = result.first if result.length > 0 && @result == Object 
         end
       end
@@ -45,6 +44,18 @@ module Boxxspring
       result
     end
 
+    def write( node, objects ) 
+      result = nil
+      Boxxspring::Request.new.tap do | request |
+        serializer = Boxxspring::Serializer.new( objects )
+        response = request.post( @path, @parameters, serializer.serialize( node ) )
+        if response.present?
+          result = response.resources
+        end
+      end
+      result
+    end
+
     protected; def spawn( parameters  )
       Boxxspring::Operation.new( 
         @path,
@@ -52,7 +63,7 @@ module Boxxspring
       )
     end
 
-    public; def normalize_include( *arguments )
+    protected; def normalize_include( *arguments )
 
       includes = {};
       arguments.each do | argument |

data/lib/boxxspring/parser.rb

@@ -4,6 +4,7 @@ module Boxxspring
 
     def initialize( content = {} )
       @content = content
+      yield self if block_given?
     end
 
     def name 
@@ -14,10 +15,14 @@ module Boxxspring
 
     def type_name 
       @content.include?( '$this' ) ?
-        @content[ '$this' ][ 'name' ] :
+        @content[ '$this' ][ 'type_name' ] :
         nil
     end
 
+    def type_name?( name )
+      self.type_name == name.to_s 
+    end
+
     def key
       'id' 
     end
@@ -43,12 +48,22 @@ module Boxxspring
     end
 
     def resource_by( name, key )
+
       @resources_index ||= Hash.new { | hash, key | hash[ key ] = {} }
+      @resource_index_mutex ||= Hash.new { | hash, key | hash[ key ] = [] }
+      
       @resources_index[ name ][ key ] ||= begin
+
+        # lock the resource index for this name/key combination
+        # note: this prevents boxxspring objects that are associated with  
+        #       themselves from causing a stack overflow
+        return nil if @resource_index_mutex[ name ].include?( key )
+        @resource_index_mutex[ name ].push( key )
+
         result = nil
         resource_attributes = resource_attribute_index[ name ][ key ]
         if resource_attributes.present? 
-          type_name = resource_attributes.delete( 'type_name' ) || self.type_name
+          type_name = resource_attributes[ 'type_name' ] || self.type_name
           klass = Boxxspring.const_get( type_name.classify ) rescue nil
           if klass.present?
             result = klass.new( 
@@ -57,8 +72,14 @@ module Boxxspring
             )
           end
         end
+
+        # unlock the resource index for this name/key combination
+        @resource_index_mutex[ name ].delete( key )
+  
         result 
+
       end
+    
     end
 
     def resource_associations_by( name, key )

data/lib/boxxspring/request.rb

@@ -27,10 +27,9 @@ module Boxxspring
       response = nil
       
       begin  
-        
-        response = 
-          Response.new( @http.get( compose_request_path( path, parameters ) ) )
-    
+        response = Response.new( 
+          @http.get( compose_request_path( path, parameters ) ) 
+        )
       rescue Timeout::Error
         response = nil
       end
@@ -39,25 +38,19 @@ module Boxxspring
                       
     end
 
-    def post( path, parameters = {} )
+    def post( path, parameters = {}, body = {} )
   
       response = nil
       
       begin  
-        
-        data = []
-        
-        parameters.each_pair do | key, value |
-          data << "#{key.to_s}=#{value.to_s}"
-        end
-        
-        response = 
-          Response.new( 
-            @http.post( 
-              compose_request_path( path ),  
-              data.join( '&' ) 
-            ) 
-          )
+               
+        request = Net::HTTP::Post.new( 
+          compose_request_path( path, parameters ), 
+          { 'Content-Type' =>'application/json' }
+        )
+        request.body = body.to_json
+
+        response = Response.new( @http.request( request ) )
         
       rescue Timeout::Error
         response = nil

data/lib/boxxspring/resources/artifact.rb

@@ -2,30 +2,32 @@ module Boxxspring
 
   class Artifact < Base
 
-    field  :type_name
-    field  :id
+    field     :id
 
-    field  :created_at
-    field  :updated_at
-    field  :edited_at
-    field  :published_at
+    field     :created_at
+    field     :updated_at
+    field     :edited_at
+    field     :published_at
 
-    field  :state
-    field  :original
+    field     :state
+    field     :original
 
-    field  :name
-    field  :short_description
-    field  :description
-    field  :note
+    field     :name
+    field     :short_description
+    field     :description
+    field     :note
 
-    field  :picture_id
+    field     :artifact_ids
+    field     :card_ids
 
-    field  :meta_description
-    field  :meta_title
-    field  :slug
+    field     :picture_id
+
+    field     :meta_description
+    field     :meta_title
+    field     :slug
     
-    field  :sponsor_id
-    field  :template_id
+    field     :sponsor_id
+    field     :template_id
 
     has_one   :attribution 
 
@@ -34,6 +36,8 @@ module Boxxspring
     has_many  :cards  
     has_many  :sponsors 
 
+    has_many  :errors
+
 	end
 
 end

data/lib/boxxspring/resources/attribute_error.rb

@@ -0,0 +1,7 @@
+module Boxxspring
+  
+  class AttributeError < Error
+    field :attribute
+  end
+
+end

data/lib/boxxspring/resources/base.rb

@@ -2,42 +2,56 @@ module Boxxspring
 
   class Base
 
-    def self.field( name, options = {} )
-      
-      class_eval(
-        "def #{name}(); " +
-           "@#{name} || " +
-             ( options[ :default ].nil? ?
-                "nil" :
-                ( options[ :default ].is_a?( String ) ? 
-                    "'#{options[ :default ]}'" : 
-                      "#{options[ :default ]}" ) ) + ";" +
-        "end;" +
-        " " +
-        "attr_writer :#{name};",
-        __FILE__, 
-        __LINE__
-      )
+    class << self
 
-    end
+      def inherited( subclass )
+        subclass.fields = {}.merge( self.fields )
+      end
+
+      def field( name, options = {} )
+        
+        self.fields[ name.to_sym ] = options.merge( name: name )
+        
+        class_eval(
+          "def #{name}(); " +
+             "@#{name} || " +
+               ( options[ :default ].nil? ?
+                  "nil" :
+                  ( options[ :default ].is_a?( String ) ? 
+                      "'#{options[ :default ]}'" : 
+                        "#{options[ :default ]}" ) ) + ";" +
+          "end;" +
+          " " +
+          "attr_writer :#{name};",
+          __FILE__, 
+          __LINE__
+        )
 
-    def self.has_one( name, options = {} )
-      define_method name do 
-        associations = self.instance_variable_get( "@_#{name.to_s.pluralize}" )
-        associations.present? ? associations.first : options[ :default ]
       end
-    end
 
-    def self.has_many( name, options = {} )  
-      define_method name do 
-        self.instance_variable_get( "@_#{name}" ) || options[ :default ] || []
+      def has_one( name, options = {} )
+        define_method name do 
+          associations = self.instance_variable_get( "@_#{name.to_s.pluralize}" )
+          associations.present? ? associations.first : options[ :default ]
+        end
       end
+
+      def has_many( name, options = {} )  
+        define_method name do 
+          self.instance_variable_get( "@_#{name}" ) || options[ :default ] || []
+        end
+      end
+
     end
 
+    class_attribute :fields, instance_writer: false
+    self.fields = {}
+
+    field :type_name
+
   	def initialize( attributes = {}, associations = {} )
-      attributes.symbolize_keys!
-      @attributes = attributes
-      attributes.dup.each do | key, value |
+      self.type_name = self.class.name.gsub( /Boxxspring::/, '' ).underscore
+      attributes.each do | key, value |
         send( "#{key}=", value ) if respond_to?( "#{key}=" )
       end
       associations.each do | key, value |

data/lib/boxxspring/resources/card.rb

@@ -5,7 +5,6 @@ module Boxxspring
     field   :created_at
     field   :updated_at
 
-    field   :type_name
     field   :id
     field   :name
     field   :body

data/lib/boxxspring/resources/error.rb

@@ -1,6 +1,7 @@
 module Boxxspring
   
-  class Error < RuntimeError
+  class Error < Base
+    field :message
   end
 
 end

data/lib/boxxspring/resources/forbidden_error.rb

@@ -0,0 +1,6 @@
+module Boxxspring
+  
+  class ForbiddenError < Error
+  end
+
+end

data/lib/boxxspring/resources/malformed_parameter_error.rb

@@ -0,0 +1,6 @@
+module Boxxspring
+  
+  class MalformedParameterError < Error
+  end
+
+end

data/lib/boxxspring/resources/missing_parameter_error.rb

@@ -0,0 +1,6 @@
+module Boxxspring
+  
+  class MissingParameterError < Error
+  end
+
+end

data/lib/boxxspring/resources/not_found_error.rb

@@ -0,0 +1,6 @@
+module Boxxspring
+  
+  class NotFoundError < Error
+  end
+
+end

data/lib/boxxspring/resources/property.rb

@@ -2,19 +2,18 @@ module Boxxspring
 
 	class Property < Base
 
-    field   :type_name
     field   :id
 
-	  field   :created_at
-	  field   :updated_at
-	  field   :destroyed_at
+    field   :created_at
+    field   :updated_at
+    field   :destroyed_at
 
-	  field   :name
-	  field   :code_name
-	  field   :domain_name
+    field   :name
+    field   :code_name
+    field   :domain_name
 
-	  field   :meta_description
-	  field   :meta_title
+    field   :meta_description
+    field   :meta_title
 
     field   :authentication_enabled,         default: false
     field   :authentication_username

data/lib/boxxspring/resources/service.rb

@@ -5,7 +5,6 @@ module Boxxspring
     field  :created_at
     field  :updated_at
 
-    field  :type_name
     field  :id
     field  :provider
     field  :public_settings

data/lib/boxxspring/resources/sponsor.rb

@@ -5,7 +5,6 @@ module Boxxspring
     field  :created_at
     field  :updated_at
 
-    field  :type_name
     field  :id
     field  :name
     field  :picture_id

data/lib/boxxspring/resources/task.rb

@@ -0,0 +1,18 @@
+module Boxxspring
+
+  class Task < Base
+
+    field   :created_at
+    field   :updated_at
+
+    field   :id
+
+    field   :state
+    field   :started_at
+    field   :ended_at
+
+    has_one :property
+
+  end
+
+end

data/lib/boxxspring/resources/theme.rb

@@ -2,7 +2,6 @@ module Boxxspring
 
 	class Theme < Base
 
-    field     :type_name
     field     :id
     field     :code_name 
     field     :name 

data/lib/boxxspring/resources/theme_environment.rb

@@ -2,7 +2,6 @@ module Boxxspring
 
 	class ThemeEnvironment < Base
 
-    field     :type_name
     field     :id
 
     field     :created_at

data/lib/boxxspring/resources/theme_template.rb

@@ -1,10 +1,7 @@
 module Boxxspring
 
   class ThemeTemplate < Base
-
-    field     :type_name
     field     :code_name
-
   end
 
 end

data/lib/boxxspring/resources/user_agent.rb

@@ -2,7 +2,6 @@ module Boxxspring
 
 	class UserAgent < Base
 
-    field  :type_name
     field  :id
 
     field  :name 

data/lib/boxxspring/resources/video.rb

@@ -15,4 +15,4 @@ module Boxxspring
     
   end
 
-end
+end

data/lib/boxxspring/resources/videos_picture_task.rb

@@ -0,0 +1,10 @@
+module Boxxspring
+
+  class VideosPictureTask < Task
+
+    field   :timecode
+    field   :picture_id
+
+  end
+
+end

data/lib/boxxspring/response.rb

@@ -2,29 +2,29 @@ module Boxxspring
 
   class Response
 
-    attr_reader :content
-    attr_reader :error
     attr_reader :code
+    attr_reader :resources 
     
     def initialize( http_response )
 
+      @success = http_response.is_a?( Net::HTTPOK )
+
       @code = http_response.code
-      @content = decode_response_body( http_response )
-      error = @content.respond_to?( :keys ) ? @content[ 'errors' ] : nil
+      @resources = []
 
-      if @content.respond_to?( :include? ) && @content.include?( 'errors' )
-        @error = 
-          Boxxspring::Error.new( @content[ 'errors' ][ 'message' ] ) 
+      content = decode_response_body( http_response )
+      if ( content && content.respond_to?( :keys ) )
+        Boxxspring::Parser.new( content ) do | parser |
+          @resources = parser.resources
+          @success = !parser.type_name?( :error )
+        end
+      else
+        @success = false
+        @resources << Boxxspring::Error.new( 
+          message: "An unknown error occured (#{@code})."
+        )
       end
-      
-      @success = 
-        http_response.is_a?( Net::HTTPOK ) && 
-        @content.present? &&
-        @error.nil?
-        
-      @error = Boxxspring::Error.new( 'unknown' ) \
-        if !@success && @error.nil?
-        
+                      
     end
 
     def success?
@@ -39,7 +39,7 @@ module Boxxspring
     
       response = nil
       
-      body = http_response.body; 
+      body = http_response.body;
       unless body.nil? || body.empty?
         response = 
           MultiJson.decode( http_response.body ) rescue nil

data/lib/boxxspring/serializer.rb

@@ -0,0 +1,31 @@
+module Boxxspring
+
+  class Serializer
+
+    def initialize( payload = [], options = {} )
+      @payload = [ payload ].flatten
+      @options = options
+    end
+
+    def serialize( node, options = {} )
+      result = {}
+      result[ node ] = @payload.map do | object |
+        node_object = {}
+        node_object[ :type_name ] = ( 
+          object.respond_to?( :type_name ) ? 
+            object.type_name :
+            object.class.name.gsub( /Boxxspring::/, '' ).underscore 
+        )
+        if object.respond_to?( :fields )
+          object.fields.each do | name, options | 
+            node_object[ name.to_sym ] = object.send( name )
+          end
+        end
+        node_object
+      end
+      result
+    end
+
+  end
+
+end

data/lib/boxxspring/version.rb

@@ -1,3 +1,3 @@
 module Boxxspring
-	VERSION = '2.0.16'
+	VERSION = '2.1.1'
 end

data/lib/boxxspring.rb

@@ -2,14 +2,23 @@ require 'active_support'
 require 'active_support/all'
 require 'multi_json'
 
-require 'boxxspring/error'
 require 'boxxspring/configuration'
 require 'boxxspring/response'
 require 'boxxspring/request'
 require 'boxxspring/parser'
+require 'boxxspring/serializer'
 require 'boxxspring/operation'
 
 require 'boxxspring/resources/base'
+
+require 'boxxspring/resources/error'
+require 'boxxspring/resources/forbidden_error'
+require 'boxxspring/resources/attribute_error'
+require 'boxxspring/resources/missing_parameter_error'
+require 'boxxspring/resources/attribute_error'
+require 'boxxspring/resources/malformed_parameter_error'
+require 'boxxspring/resources/not_found_error'
+
 require 'boxxspring/resources/picture'
 require 'boxxspring/resources/user_agent'
 require 'boxxspring/resources/theme_environment'
@@ -37,3 +46,5 @@ require 'boxxspring/resources/playlist'
 require 'boxxspring/resources/group'
 require 'boxxspring/resources/property'
 require 'boxxspring/resources/service'
+require 'boxxspring/resources/task'
+require 'boxxspring/resources/videos_picture_task'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxxspring
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.1.1
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -75,18 +75,22 @@ extra_rdoc_files: []
 files:
 - lib/boxxspring.rb
 - lib/boxxspring/configuration.rb
-- lib/boxxspring/error.rb
 - lib/boxxspring/operation.rb
 - lib/boxxspring/parser.rb
 - lib/boxxspring/request.rb
 - lib/boxxspring/resources/artifact.rb
 - lib/boxxspring/resources/atomic_video_card.rb
+- lib/boxxspring/resources/attribute_error.rb
 - lib/boxxspring/resources/attribution.rb
 - lib/boxxspring/resources/author.rb
 - lib/boxxspring/resources/base.rb
 - lib/boxxspring/resources/card.rb
 - lib/boxxspring/resources/error.rb
+- lib/boxxspring/resources/forbidden_error.rb
 - lib/boxxspring/resources/group.rb
+- lib/boxxspring/resources/malformed_parameter_error.rb
+- lib/boxxspring/resources/missing_parameter_error.rb
+- lib/boxxspring/resources/not_found_error.rb
 - lib/boxxspring/resources/organization.rb
 - lib/boxxspring/resources/page.rb
 - lib/boxxspring/resources/picture.rb
@@ -100,6 +104,7 @@ files:
 - lib/boxxspring/resources/sponsor.rb
 - lib/boxxspring/resources/story.rb
 - lib/boxxspring/resources/tag.rb
+- lib/boxxspring/resources/task.rb
 - lib/boxxspring/resources/team.rb
 - lib/boxxspring/resources/text_card.rb
 - lib/boxxspring/resources/theme.rb
@@ -109,7 +114,9 @@ files:
 - lib/boxxspring/resources/video.rb
 - lib/boxxspring/resources/video_card.rb
 - lib/boxxspring/resources/video_source.rb
+- lib/boxxspring/resources/videos_picture_task.rb
 - lib/boxxspring/response.rb
+- lib/boxxspring/serializer.rb
 - lib/boxxspring/version.rb
 homepage: http://bedrocket.com
 licenses:

data/lib/boxxspring/error.rb

@@ -1,6 +0,0 @@
-module Boxxspring
-  
-  class Error < RuntimeError
-  end
-
-end