metrika 0.0.2 → 0.0.3

data/README.md

@@ -3,6 +3,8 @@ Metrika
 
 Wrapper for Yandex.Metrika API
 
+Inspired by [Wynn Netherland's LinkedIn Gem](https://github.com/pengwynn/linkedin).
+
 # Info
 
 **Under heavy development!**
@@ -26,6 +28,17 @@ Wrapper for Yandex.Metrika API
     c.delete_counter(id)
     c.check_counter(id)
 
+    #goals
+    c.get_counter_goals(counter_id)
+    c.create_counter_goal(counter_id, params)
+    c.create_counter_goal(counter_id, params)
+    c.get_counter_goal(counter_id, id)
+    c.update_counter_goal(counter_id, id, params)
+    c.delete_counter_goal(counter_id, id)
+
+    #stats
+    c.get_counter_stat_traffic_summary(1131265, :group => :month, :date1 => Date.parse('20110925'), :date2 => Date.today)
+
 # Object API    
 
 Later…

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/metrika.rb

@@ -1,8 +1,7 @@
-METRIKA_PATH = File.dirname(__FILE__) + "/metrika/"
+METRIKA_PATH = File.dirname(__FILE__) + '/metrika/'
 
-require METRIKA_PATH + 'helpers/authorization'
-require METRIKA_PATH + 'helpers/parser'
-require METRIKA_PATH + 'helpers/request'
+require METRIKA_PATH + 'helpers'
+require METRIKA_PATH + 'ext'
 
 require METRIKA_PATH + 'api/methods'
 require METRIKA_PATH + 'client'

data/lib/metrika/api/methods.rb

@@ -53,7 +53,7 @@ module Metrika
       end
 
       def get_counter_goal(counter_id, id)
-        self.get(self.counter_goal_path(counter_id, id))['goal']        
+        self.get(self.counter_goal_path(counter_id, id))['goal']
       end      
 
       def update_counter_goal(counter_id, id, params)
@@ -67,6 +67,17 @@ module Metrika
       def counter_goal_path(counter_id, id)
         "/counter/#{counter_id}/goal/#{id}"
       end
+
+      # Statistics
+      def get_counter_stat_traffic_summary(id, params = {})
+        params = self.format_params(params)
+        
+        self.get(self.counter_stat_traffic_summary_path, params.merge(:id => id))
+      end
+
+      def counter_stat_traffic_summary_path
+        "/stat/traffic/summary"
+      end
     end
   end
 end

data/lib/metrika/client.rb

@@ -1,8 +1,6 @@
 module Metrika
   class Client
-    include Helpers::Authorization
-    include Helpers::Request
-    include Helpers::Parser
+    include Helpers    
 
     include Api::Methods
 
@@ -10,5 +8,9 @@ module Metrika
       @application_id = application_id
       @application_password = application_password
     end
+
+  protected
+    
+
   end
 end

data/lib/metrika/ext.rb

@@ -0,0 +1,9 @@
+class Object
+  def blank?
+    !self     
+  end unless method_defined? :blank?
+
+  def present?
+    !blank?
+  end unless method_defined? :present?
+end

data/lib/metrika/helpers.rb

@@ -0,0 +1,21 @@
+module Metrika
+  module Helpers
+    autoload :Authorization, METRIKA_PATH + "helpers/authorization"
+    autoload :Request,       METRIKA_PATH + "helpers/request"
+
+    include Metrika::Helpers::Authorization
+    include Metrika::Helpers::Request
+
+  protected
+    def format_params(params)  
+      params[:date1] = self.format_date(params[:date1]) if params[:date1].present?
+      params[:date2] = self.format_date(params[:date2]) if params[:date2].present?
+
+      params
+    end
+
+    def format_date(date)
+      date.is_a?(Date) || date.is_a?(DateTime) ? date.strftime('%Y%m%d') : date
+    end
+  end
+end

data/metrika.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "metrika"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
@@ -27,8 +27,9 @@ Gem::Specification.new do |s|
     "lib/metrika/api/methods.rb",
     "lib/metrika/client.rb",
     "lib/metrika/errors.rb",
+    "lib/metrika/ext.rb",
+    "lib/metrika/helpers.rb",
     "lib/metrika/helpers/authorization.rb",
-    "lib/metrika/helpers/parser.rb",
     "lib/metrika/helpers/request.rb",
     "metrika.gemspec",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrika
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -126,8 +126,9 @@ files:
 - lib/metrika/api/methods.rb
 - lib/metrika/client.rb
 - lib/metrika/errors.rb
+- lib/metrika/ext.rb
+- lib/metrika/helpers.rb
 - lib/metrika/helpers/authorization.rb
-- lib/metrika/helpers/parser.rb
 - lib/metrika/helpers/request.rb
 - metrika.gemspec
 - test/helper.rb
@@ -147,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1085198774262121811
+      hash: -3176208076306458523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/metrika/helpers/parser.rb

@@ -1,11 +0,0 @@
-module Metrika
-  module Helpers
-    module Parser
-
-    protected
-      def parse_json(data)        
-        Yajl::Parser.parse(data)
-      end
-    end
-  end
-end