jirafe 0.5.0 → 0.6.0

data/README.md

@@ -1,6 +1,7 @@
 # Jirafe Analytics Ruby Client
 
 [![Build Status](https://secure.travis-ci.org/jirafe/jirafe-ruby-client.png)](http://travis-ci.org/jirafe/jirafe-ruby-client)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jirafe/jirafe-ruby-client)
 
 This is the official [Jirafe](http://jirafe.com/) rubygem.
 It fully wraps Jirafe's [API](http://api.jirafe.com).

data/lib/jirafe.rb

@@ -17,6 +17,7 @@ module Jirafe
   autoload :Configuration, "jirafe/configuration.rb"
   autoload :Error, "jirafe/error.rb"
   autoload :ResponseParser, "jirafe/response_parser.rb"
+  autoload :Model, "jirafe/model.rb"
   autoload :Asset, "jirafe/asset.rb"
   autoload :Tracker, "jirafe/tracker.rb"
   module Resource

data/lib/jirafe/callback/events/data_helper.rb

@@ -2,12 +2,6 @@ module Jirafe
   module Callback
     module Events
       module DataHelper
-        def initialize(attributes = {})
-          attributes.each do |attr, value|
-            self.send("#{attr}=", value) if self.respond_to?("#{attr}=")
-          end
-        end
-
         def format_amount(amount)
           return nil if amount.nil?
           "%01.4f" % amount

data/lib/jirafe/callback/events/item.rb

@@ -2,6 +2,7 @@ module Jirafe
   module Callback
     module Events
       class Item
+        include Jirafe::Model
         include DataHelper
         attr_accessor :sku, :name, :price, :quantity, :category
 

data/lib/jirafe/callback/events/order.rb

@@ -2,6 +2,7 @@ module Jirafe
   module Callback
     module Events
       class Order < Jirafe::Callback::Event
+        include Jirafe::Model
         include DataHelper
         attr_accessor :identifier, :status, :customer, :visitor_identifier, :created_at,
           :grand_total, :sub_total, :tax_amount, :shipping_amount, :discount_amount, :items

data/lib/jirafe/callback/events/refund.rb

@@ -2,6 +2,7 @@ module Jirafe
   module Callback
     module Events
       class Refund < Jirafe::Callback::Event
+        include Jirafe::Model
         include DataHelper
         attr_accessor :identifier, :order_identifier, :created_at,
           :grand_total, :sub_total, :tax_amount, :shipping_amount,

data/lib/jirafe/configuration.rb

@@ -34,11 +34,6 @@ module Jirafe
       @test = value == true
     end
 
-    def token
-      raise Error::MissingToken if @token.nil?
-      @token
-    end
-
     def logger
       @logger ||= (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
     end

data/lib/jirafe/model.rb

@@ -0,0 +1,14 @@
+module Jirafe
+  module Model
+    def initialize(attributes = {})
+      reinitialize(attributes)
+    end
+
+    def reinitialize(attributes = {})
+      attributes.each do |attr, value|
+        self.send("#{attr}=", value) if self.respond_to?("#{attr}=")
+      end
+      self
+    end
+  end
+end

data/lib/jirafe/resource/jirafe_resource.rb

@@ -3,6 +3,7 @@ module Jirafe
     class JirafeResource
       include HTTParty
       include Jirafe::ResponseParser
+      include Jirafe::Model
 
       base_uri Jirafe.config.url
       format :json
@@ -18,14 +19,7 @@ module Jirafe
           return @attributes if @attributes && attrs === {}
           attrs.each_pair do |attr_name, options|
             attr_accessor attr_name
-            if options.include?(:identifier)
-              define_method attr_name do
-                ivar = instance_variable_get("@#{attr_name}")
-                ivar.nil? ? nil : ivar.to_i
-              end
-              alias_method :identifier, attr_name
-              alias_method :identifier=, "#{attr_name}="
-            end
+            define_identifier(attr_name) if options.include?(:identifier)
           end
           @attributes ||= attrs
         end
@@ -54,7 +48,6 @@ module Jirafe
         def list(*parent_identifiers)
           if parent_identifiers.last.is_a?(Hash)
             options = {:query => parent_identifiers.pop }
-            options = parent_identifiers.pop
           end
           response = get(resource_url(nil, *parent_identifiers), options_with_token(options || {}))
           check_response_for_exception(response)
@@ -68,26 +61,37 @@ module Jirafe
             options = {:query => parent_identifiers.pop }
           end
           response = get(resource_url(identifier, *parent_identifiers), options_with_token(options || {}))
-          check_response_for_exception(response)
-          self.new(response.parsed_response)
+          handle_response(self.new, response)
         end
 
         def create(resource)
           resource_id, parent_identifiers = identifiers_from_resource(resource)
           response = post(resource_url(resource_id, *parent_identifiers), options_with_token({:body => resource.attributes_for_change(:create)}))
-          check_response_for_exception(response)
-          resource.reinitialize(response.parsed_response)
+          handle_response(resource, response)
         end
 
         def update(resource)
           resource_id, parent_identifiers = identifiers_from_resource(resource)
           response = put(resource_url(resource_id, parent_identifiers), options_with_token({:body => resource.attributes_for_change(:update)}))
-          check_response_for_exception(response)
-          resource.reinitalize(response.parsed_response)
+          handle_response(resource, response)
         end
 
         private
 
+        def define_identifier(attribute)
+          define_method attribute do
+            ivar = instance_variable_get("@#{attribute}")
+            ivar.nil? ? nil : ivar.to_i
+          end
+          alias_method :identifier, attribute
+          alias_method :identifier=, "#{attribute}="
+        end
+
+        def handle_response(resource, response)
+          check_response_for_exception(response)
+          resource.reinitialize(response.parsed_response)
+        end
+
         def identifiers_from_resource(resource)
           return [] if resource.nil? || !resource.respond_to?(:identifier)
           [resource.identifier] + identifiers_from_resource(resource.parent)
@@ -95,19 +99,11 @@ module Jirafe
 
         def options_with_token(options = {})
           query_options = options.delete(:query) || {}
-          {:query => { :token => Jirafe.config.token }.merge(query_options) }.merge(options)
-        end
-      end
-
-      def initialize(attributes = {})
-        reinitialize(attributes)
-      end
-
-      def reinitialize(attributes = {})
-        attributes.each do |attr, value|
-          self.send("#{attr}=", value) if self.respond_to?("#{attr}=")
+          default_query = { :query => {} }
+          default_query[:query][:token] = Jirafe.config.token unless Jirafe.config.token.nil?
+          default_query[:query].merge!(query_options)
+          default_query.merge(options)
         end
-        self
       end
 
       def attributes

data/lib/jirafe/version.rb

@@ -1,3 +1,3 @@
 module Jirafe
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/jirafe/configuration_spec.rb

@@ -122,16 +122,6 @@ describe Jirafe::Configuration do
   describe "#token" do
     subject { instance.token }
 
-    context "when it is not set" do
-      before { instance.reset! }
-
-      it "should raise an error" do
-        expect {
-          subject
-        }.to raise_error(Jirafe::Error::MissingToken)
-      end
-    end
-
     context "when it is set" do
       before { instance.token = "mytoken" }
       after { instance.reset! }
@@ -182,7 +172,6 @@ describe Jirafe::Configuration do
       instance.reset!
       instance.url.should == "https://api.jirafe.com/v1"
       instance.callback_url.should == "https://data.jirafe.com"
-      expect { instance.token }.to raise_error(Jirafe::Error::MissingToken)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirafe
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -226,6 +226,7 @@ files:
 - lib/jirafe/callback/jirafe_callback.rb
 - lib/jirafe/configuration.rb
 - lib/jirafe/error.rb
+- lib/jirafe/model.rb
 - lib/jirafe/resource/application.rb
 - lib/jirafe/resource/jirafe_resource.rb
 - lib/jirafe/resource/resources.rb