google_api 1.0.3 → 1.1.0.beta

data/lib/google_api/shorten/shorten.rb

@@ -0,0 +1,28 @@
+module GoogleApi
+  module Shorten
+
+    CONFIGURATION = {}
+
+    # Session
+    autoload :Session, 'google_api/shorten/session'
+
+    # Url
+    autoload :Url, 'google_api/shorten/url/url'
+    autoload :Insert, 'google_api/shorten/url/insert'
+    autoload :List, 'google_api/shorten/url/list'
+    autoload :Get, 'google_api/shorten/url/get'
+
+    def self.insert(url)
+      Insert.new(url)
+    end
+
+    def self.list
+      List.new
+    end
+
+    def self.get(url, projection = 'FULL')
+      Get.new(url, projection)
+    end
+
+  end
+end

data/lib/google_api/shorten/url/get.rb

@@ -0,0 +1,32 @@
+module GoogleApi
+  module Shorten
+    class Get < Url
+
+      attr_reader :short_url
+      attr_reader :projection
+      attr_reader :data
+
+      PROJECTION_LIST = ['FULL', 'ANALYTICS_CLICKS', 'ANALYTICS_TOP_STRINGS']
+
+      def initialize(short_url, projection)
+        @short_url  = short_url
+        @projection = projection.upcase
+
+        unless PROJECTION_LIST.include?(projection)
+          raise GoogleApi::ShortenError, "Invalid projection. Must be #{PROJECTION_LIST.join(',')}."
+        end
+
+        get
+      end
+
+      private
+
+        def get
+          @data = JSON.parse(_session.client.execute( api_method: _session.api.url.get,
+                                           parameters: { shortUrl: @short_url,
+                                                         projection: @projection } ).response.env[:body])
+        end
+      
+    end
+  end
+end

data/lib/google_api/shorten/url/insert.rb

@@ -0,0 +1,28 @@
+module GoogleApi
+  module Shorten
+    class Insert < Url
+
+      attr_reader :long_url
+      attr_reader :short_url
+
+      def initialize(long_url)
+        @long_url = long_url
+
+        get
+      end
+
+      def details(projection = 'FULL')
+        Shorten.get(@short_url, projection)
+      end
+
+      private
+
+        def get
+          @short_url = _session.client.execute( api_method: _session.api.url.insert,
+                                                body: { longUrl: @long_url }.to_json, 
+                                                headers: {'Content-Type' => 'application/json'} ).data.id
+        end
+      
+    end
+  end
+end

data/lib/google_api/shorten/url/list.rb

@@ -0,0 +1,26 @@
+module GoogleApi
+  module Shorten
+    class List < Url
+
+      def initialize
+        get
+      end
+
+      def count
+        @data['totalItems']
+      end
+
+      def items
+        @data['items']
+      end
+
+      private
+        
+        def get
+          @data = JSON.parse(_session.client.execute( api_method: _session.api.url.list,
+                                                      parameters: { projection: 'FULL' } ).response.env[:body])
+        end
+
+    end
+  end
+end

data/lib/google_api/shorten/url/url.rb

@@ -0,0 +1,11 @@
+module GoogleApi
+  module Shorten
+    class Url
+      
+      def _session
+        Session
+      end
+
+    end
+  end
+end

data/lib/google_api/version.rb

@@ -1,3 +1,3 @@
 module GoogleApi
-  VERSION = "1.0.3"
+  VERSION = "1.1.0.beta"
 end

data/spec/lib/google_api_ga_data_spec.rb

@@ -7,14 +7,6 @@ describe "GoogleApi::Ga::Data" do
 
 
 
-  # Rows
-  # -------------------------------------------------------------------------------------------------
-  it "rows" do
-    lambda { @data.new.rows }.should raise_error(GoogleApi::SessionError)
-  end
-
-
-
   # Default values
   # -------------------------------------------------------------------------------------------------
   it "default values" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google_api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.1.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -59,7 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Simple Google Api. Include google analytics.
+description: Simple Google Api. Include google analytics, url shortener.
 email:
 - moravcik.ondrej@gmail.com
 executables: []
@@ -80,13 +80,11 @@ files:
 - lib/google_api/configuration.rb
 - lib/google_api/core_ext/hash.rb
 - lib/google_api/core_ext/string.rb
-- lib/google_api/date.rb
-- lib/google_api/ga.rb
 - lib/google_api/ga/data.rb
 - lib/google_api/ga/data/data_dsl.rb
 - lib/google_api/ga/data/filters_dsl.rb
 - lib/google_api/ga/data/segment_dsl.rb
-- lib/google_api/ga/helper.rb
+- lib/google_api/ga/ga.rb
 - lib/google_api/ga/management/account.rb
 - lib/google_api/ga/management/goal.rb
 - lib/google_api/ga/management/management.rb
@@ -94,6 +92,14 @@ files:
 - lib/google_api/ga/management/segment.rb
 - lib/google_api/ga/management/webproperty.rb
 - lib/google_api/ga/session.rb
+- lib/google_api/session/session.rb
+- lib/google_api/session/session_methods.rb
+- lib/google_api/shorten/session.rb
+- lib/google_api/shorten/shorten.rb
+- lib/google_api/shorten/url/get.rb
+- lib/google_api/shorten/url/insert.rb
+- lib/google_api/shorten/url/list.rb
+- lib/google_api/shorten/url/url.rb
 - lib/google_api/version.rb
 - spec/lib/google_api_cache_spec.rb
 - spec/lib/google_api_ga_data_spec.rb
@@ -115,15 +121,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Simple Google Api. Include google analytics.
+summary: Simple Google Api. Include google analytics, url shortener.
 test_files:
 - spec/lib/google_api_cache_spec.rb
 - spec/lib/google_api_ga_data_spec.rb

data/lib/google_api/date.rb

@@ -1,58 +0,0 @@
-require "date"
-
-module GoogleApi
-  module Date
-
-    DATE_FORMAT = /\A[0-9]{4}-[0-9]{2}-[0-9]{2}\Z/
-
-    def to_date(date)
-      if date.is_a?(String)
-        unless date =~ DATE_FORMAT
-          raise GoogleApi::DateError, "Date: #{date} must match with #{DATE_FORMAT}."
-        end
-
-        date = Date.parse(date)
-      end
-
-      date.to_date
-    end
-
-    def now
-      Date.today
-    end
-
-    def prev_month
-      Date.today.prev_month
-    end
-
-    def more_months?(d1, d2)
-
-      d1 = Date.parse(d1) if d1.is_a?(String)
-      d2 = Date.parse(d2) if d2.is_a?(String)
-
-      d1.month != d2.month
-    end
-
-    def more_years?(d1, d2)
-
-      d1 = Date.parse(d1) if d1.is_a?(String)
-      d2 = Date.parse(d2) if d2.is_a?(String)
-
-      d1.year != d2.year
-    end
-
-    def day_older?(date)
-      
-      if date.is_a?(String)
-        date = Date.parse(date)
-      end
-
-      if (Date.today <=> date.to_date) > 0
-        return true
-      end
-
-      return false
-    end
-
-  end
-end

data/lib/google_api/ga/helper.rb

@@ -1,41 +0,0 @@
-module GoogleApi
-  module Ga
-    module Helper
-
-      # Same as get but automaticly add day, month and year to dimension
-      #
-      # Also check cache
-      #
-      def get_by_day(parameters, start_date = prev_month, end_date = now, expire = nil)
-        
-        [:dimensions, :sort].each do |param|
-          parameters[param] = [] unless parameters[param]
-
-          if parameters[param].is_a?(String) || parameters[param].is_a?(Symbol)
-            parameters[param] = [parameters[param]]
-          end
-        end
-
-        parameters[:dimensions] << :day
-
-        if more_years?(start_date, end_date)
-          parameters[:dimensions] << :month
-          parameters[:dimensions] << :year
-
-          parameters[:sort] << :year
-          parameters[:sort] << :month
-
-        elsif more_months?(start_date, end_date)
-          parameters[:dimensions] << :month
-
-          parameters[:sort] << :month
-        end
-
-        parameters[:sort] << :day
-
-        get(parameters, start_date, end_date, expire)
-      end
-
-    end
-  end
-end