google_api 1.1.0.beta → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.0
+
+* add some test
+* GoogleApi::Ga::Data.clear now return self
+* GoogleApi::Ga::Data
+* GoogleApi::Shorten.insert and GoogleApi::Shorten.get is available without login
+
 ## v1.1.0.beta
 
 * add google urlshorter

data/README.md

@@ -2,18 +2,10 @@ Google Api [![Build Status](https://secure.travis-ci.org/ondra-m/google_api.png)
 ==========
 
 Analytics<br>
-Url shortener - documentation is not complete yet<br>
+Url shortener<br>
 Calendar - will be soon 
 
-Google Analytics
-================
-
-<a href="#examples">examples</a>
-
-News
-----
-
-For now is released beta version. Pleas use issues for problems.
+More informations in [wiki](https://github.com/ondra-m/google_api/wiki).
 
 Installation
 ------------
@@ -29,481 +21,3 @@ And then execute:
 Or install it yourself as:
 
 `$ gem install google_api`
-
-Configuration
--------------
-
-First you must create project at <a href="https://code.google.com/apis/console" target="_blank">google console</a>.   
-
-```ruby
-GoogleApi.configure do
-  client_id "1"
-
-  ga do
-    client_id "2"
-  end
-end
-
-# ----- OR -----
-
-GoogleApi.config.client_id    = "4"
-GoogleApi.config.ga.client_id = "5"
-```
-
-<table>
-  <thead>
-    <tr>
-      <th>name</th>
-      <th>example</th>
-      <th>note</th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr>
-      <td>client_id</td>
-      <td><i>123456.apps.googleusercontent.com</i></td>
-      <td rowspan="3">required for oauth 2</td>
-    </tr>
-    <tr>
-      <td>client_secret</td>
-      <td><i>123456123456123456</i></td>
-    </tr>
-    <tr>
-      <td>redirect_uri</td>
-      <td><i>http://localhost/oauth2callback</i></td>
-    </tr>
-    <tr>
-      <td>client_developer_email</td>
-      <td><i>123456@developer.gserviceaccount.com</i></td>
-      <td rowspan="3">required for login by cert</td>
-    </tr>
-    <tr>
-      <td>client_cert_file</td>
-      <td><i>/home/user/app/123456-privatekey.p12</i></td>
-    </tr>
-    <tr>
-      <td>key_secret</td>
-      <td><i>notasecret</i></td>
-    </tr>
-    <tr>
-      <td colspan="3">only for ga</td>
-    </tr>
-    <tr>
-      <td>cache</td>
-      <td><i>default: </i><b>GoogleApi::Cache.new</b></td>
-      <td>more information <a href="#Cache">Cache</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<a name="Cache"></a>
-Cache
------
-
-Cache must have these methods:
-
-`write(key, value, expire)` - expire=0 for never expire<br>
-`read(key)`<br>
-`exists?(key)`<br>
-`delete(key)`
-
-Session
--------
-
-There is a 3 way for starting sesssion. Client login with username and password is deprecated.
-
-### By cert file
-
-`First you must add your developer email to google analytics profile.`
-
-```ruby
-# try login once
-GoogleApi::Ga::Session.login_by_cert
-
-# ----- OR -----
-
-# trying login in loop
-GoogleApi::Ga::Session.login_by_cert!
-```
-
-### By oauth 2
-
-```ruby
-# return uri for oauth 2 login
-GoogleApi::Ga::Session.login
-
-# after callback
-# code = code key in query (params[:code])
-GoogleApi::Ga::Session.login(code)
-```
-
-**In rails:**
-
-```ruby
-redirect_to(GoogleApi::Ga::Session.login)
-
-# in page specified in redirect_uri
-GoogleApi::Ga::Session.login(params[:code])
-```
-
-### By oauth 2 via line (browser needed)
-
-This will create TCPServer. After login will be closed.
-
-**server:** optional is localhost, must be full path!<br>
-**port:** on which port the server will listen
-
-```ruby
-# default:
-#   server = http://localhost/oauth2callback
-#   port = 0 - get first free port
-GoogleApi::Ga::Session.login_by_line(server, port)
-```
-
-Management
-----------
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="2">Account ~~~ Webproperty ~~~ Profile ~~~ Goal ~~~ Segment</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><b>all</b></td>
-      <td>find all</td>
-    </tr>
-    <tr>
-      <td><b>find(id)</b></td>
-      <td>find one by id</td>
-    </tr>
-    <tr>
-      <td><b>refresh</b></td>
-      <td>refresh data</td>
-    </tr>
-  </tbody>
-</table>
-
-#### Account
-
-```ruby
-# Variables: id, name, created, updated
-# Methods:   webproperties
-GoogleApi::Ga::Account
-```
-
-#### Webproperty
-
-```ruby
-# Variables: id, name, created, updated, accountId, websiteUrl
-# Methods:   account, profiles
-GoogleApi::Ga::Webproperty
-```
-
-#### Profile
-
-```ruby
-# Variables: id, name, created, updated, accountId, websiteUrl, currency, timezone
-# Methods:   webproperty, goals
-GoogleApi::Ga::Profile
-```
-
-#### Goal
-
-```ruby
-# Variables: accountId, webPropertyId, profileId, value, active, type, goal
-# Methods:   profile
-GoogleApi::Ga::Goal
-```
-
-#### Segment
-
-```ruby
-# Variables: id, name, created, updated, segmentId, definition
-GoogleApi::Ga::Segment
-```
-
-Set default id
---------------
-
-```ruby
-GoogleApi::Ga.id(123456) # profile id
-```
-
-Data
-----
-
-First you can play on the playground: http://ga-dev-tools.appspot.com/explorer/.
-
-```ruby
-GoogleApi::Ga::Data
-```
-
-<br>
-
-<table>
-  <thead>
-    <tr>
-      <th>method name</th>
-      <th>alias</th>
-    </tr>
-  </thead>
-  
-  <tbody>
-    <tr>
-      <td>ids</td>
-      <td>id</td>
-    </tr>
-    <tr>
-      <td>start_date</td>
-      <td>from</td>
-    </tr>
-    <tr>
-      <td>end_date</td>
-      <td>to</td>
-    </tr>
-    <tr>
-      <td>metrics</td>
-      <td>select</td>
-    </tr>
-    <tr>
-      <td>dimensions</td>
-      <td>with</td>
-    </tr>
-    <tr>
-      <td>sort</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>filters</td>
-      <td>where</td>
-    </tr>
-    <tr>
-      <td>segment</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>start_index</td>
-      <td>offset</td>
-    </tr>
-    <tr>
-      <td>max_results</td>
-      <td>limit</td>
-    </tr>
-  </tbody>
-</table>
-
-
-> ## ids 
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#ids" target="_blank">doc</a>
->
-> Id of profile, by default is use id from GoogleApi::Ga.id.
-
-<br>
-
-> ## start_date, &nbsp;&nbsp; end_date
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#startDate" target="_blank">start-date</a>, <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#startDate" target="_blank">end-date</a>
->
-> **default:** _Date.today_<br>
-> **parameters:**<br>
-> &nbsp;&nbsp; _String_ in YYYY-MM-DD or _Date_ or _DateTime_ or _Time_<br>
-> &nbsp;&nbsp; _Integer_ for add or sub days from _Date.today_
-
-<br>
-
-> ## metrics, &nbsp;&nbsp; dimensions, &nbsp;&nbsp; sort
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#metrics" target="_blank">metrics</a>, <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#dimensions" target="_blank">dimensions</a>, <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#sort" target="_blank">sort</a>
->
-> you can also add or sub parameters with `.method_add` or `.method_sub`
->
-> **parameters:** Array with String or Symbol, String (not compiled, <i>"ga:visitors"</i>) or Symbol (compiled, <i>:visitors</i>)
-
-<br>
-
-> ## filters, &nbsp;&nbsp; segment
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#filters" target="_blank">filters</a>, <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#segment" target="_blank">segment</a>
->
-> **parameters:**<br>
-> {(attribute operator value) & (attribute operator value) | (attribute operator value)} or String (not compiled)
->
-> **operators:** ==, !=, >, <, >=, <=, =~, !~<br>
-> % &nbsp;&nbsp;&nbsp; _is &nbsp;=@_<br>
-> ** &nbsp;&nbsp;&nbsp; _is &nbsp;&nbsp;!@_
-
-<br>
-
-> ## start_index
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#startIndex" target="_blank">start-index</a>
->
-> **parameters:** Integer from 1. 
-
-<br>
-
-> ## max_results
->
-> **doc:** <a href="https://developers.google.com/analytics/devguides/reporting/core/v3/reference#maxResults" target="_blank">max-results</a>
->
-> **parameters:** Integer from 1 to 10 000. 
-
-
-### Cache
-
-For how long in minutes will be data cached. Use 0 for never expire.
-```ruby
-GoogleApi::Ga::Data.cache(minutes)
-
-# you can also clear cache
-# it will clear cache only for entered parameters
-GoogleApi::Ga::Data.clear_cache
-
-# if you want clear cache and cache new
-GoogleApi::Ga::Data.select(:visits).clear_cache.cache(60)
-
-# or if you don't want use cache at all, default: true
-GoogleApi::Ga::Data.use_cache(false)
-```
-
-### Error
-
-What happen if parameters are wrong.
-```ruby
-# raise error with message
-GoogleApi::Ga::Data.error(true)
-
-# default, not raise error, just empty result
-GoogleApi::Ga::Data.error(false)
-```
-
-### Fetch data
-
-You can use one of these. Data is stored in the class.
-
-```
-.all    # [header, rows]
-.rows   # rows returned by google analytics
-.header # header of data, (["ga:day", "ga:month", "ga:visitis"])
-.count  # number of rows
-.each   # each as you expected, (|data| or |index, data|)
-```
-
-### Clear stored data and fetch again
-
-If you add some parameters clear is called automatically.
-
-clear: `.clear`<br>
-
-clear and fetch new:<br>
-`.all!`, `.rows!`, `.header!`, `.count!`, `.each!`<br>
-
-Examples
---------
-
-```ruby
-# Start session
-# =============
-
-  # set configuration
-  GoogleApi.config.ga.client_cert_file = "privatekey.p12"
-  GoogleApi.config.ga.client_developer_email = "123456@developer.gserviceaccount.com"
-
-  # start session
-  GoogleApi::Ga::Session.login_by_cert!
-
-
-
-# Get profile id
-# ==============
-
-  # get profile id
-  id = GoogleApi::Ga::Profile.all.first.id
-
-  # set default id
-  GoogleApi::Ga.id(id)
-
-
-
-# Starting session by line
-# ========================
-
-  # First install launchy:
-  #   gem install launchy
-
-  # callback_uri and port are optional - auto start server at localhost
-  GoogleApi::Ga::Session.login_by_line(callback_uri, port)
-
-  # This will do
-  # 1) create server
-  # 2) launch browser and redirect to google api
-  # 3) confirm and google api redirect to localhost
-  # 4) server get code and start session
-  # 5) close server - you are login
-
-
-
-# Check session, error if not login
-# =================================
-
-  GoogleApi::Ga::Session.check_session
-  
-  
-  
-# Management of accounts
-# ======================
-
-  # all accounts
-  accounts = GoogleApi::Ga::Account.all
-
-  # webproperties for account
-  accounts.first.webproperties
-
-  # all webproperties
-  GoogleApi::Ga::Webproperty.all
-
-  # all profiles
-  GoogleApi::Ga::Profile.all
-
-  # all goal
-  GoogleApi::Ga::Goal.all
-
-  # all segment
-  GoogleApi::Ga::Segment.all
-
-
-
-# Count of visitors between previous month and today
-# ==================================================
-
-  GoogleApi::Ga::Data.from(-30).select(:visits).rows
-
-
-
-# Count of visitors between previous month and today - 2, and cache it for 30 minutes
-# ===================================================================================
-
-GoogleApi::Ga::Data.from(-30).to(-2).select(:visits).cache(30).rows
-
-
-
-# Visitors by day, month, year from Czech Republic. Browser is Firefox and Opera or Chrome
-# ========================================================================================
-
-  GoogleApi::Ga::Data.from(-30).select(:visits).with(:day, :month, :year)
-                     .sort(:year, :month, :day)
-                     .where{(country == "Czech Republic") & 
-                            (browser == "Firefox") &
-                            (browser == "Opera") | 
-                            (browser == "Chrome")}
-                     .rows
-  # ----- OR -----
-  GoogleApi::Ga::Data.from(-30).select(:visits).with(:day, :month, :year)
-                     .sort(:year, :month, :day)
-                     .where("ga:country==Czech Republic;ga:browser==Firefox;ga:browser==Opera,ga:browser==Chrome")
-                     .rows
-```

data/lib/google_api.rb

@@ -1,6 +1,5 @@
 require "google/api_client"
 
-require "google_api/core_ext/hash"
 require "google_api/configuration"
 require "google_api/version"
 

data/lib/google_api/ga/data.rb

@@ -214,6 +214,8 @@ module GoogleApi
         @parameters = nil
         @data       = nil
         @all        = nil
+
+        self
       end
 
       # Clear cache
@@ -223,9 +225,9 @@ module GoogleApi
       end
 
       # Add row!, header!, all!, count!. First clear and run normal method.
-      [:rows, :header, :all, :count].each do |value|
+      [:rows, :header, :all, :count].each do |name|
         eval <<-METHOD
-          def #{value}!; clear; #{value}; end
+          def #{name}!; clear; #{name}; end
         METHOD
       end
 
@@ -246,16 +248,20 @@ module GoogleApi
       end
 
       def each(&block)
-        if block.arity == 1 # each
-          rows.each do |row|
-            yield(row)
-          end
-        else                # each with index
-          i = -1
-          rows.each do |row|
-            i += 1
-            yield(i, row)
-          end
+        case block.arity
+          # each
+          when 1
+            rows.each do |row|
+              yield(row)
+            end
+
+          # each with index
+          when 2
+            i = -1
+            rows.each do |row|
+              i += 1
+              yield(i, row)
+            end
         end
       end
 

data/lib/google_api/ga/management/goal.rb

@@ -2,9 +2,9 @@ module GoogleApi
   module Ga
     class Goal < Management
 
-      attr_reader :accountId
-      attr_reader :webPropertyId
-      attr_reader :profileId
+      attr_reader :account_id
+      attr_reader :webproperty_id
+      attr_reader :profile_id
       attr_reader :value
       attr_reader :active
       attr_reader :type
@@ -25,13 +25,13 @@ module GoogleApi
       def refresh
         @profile  = nil
 
-        set( Goal.get({ accountId: @accountId, webPropertyId: @id, profileId: @profileId, goalId: @id }).first )
+        set( Goal.get({ accountId: @account_id, webPropertyId: @webproperty_id, profileId: @profile_id, goalId: @id }).first )
 
         return true
       end
 
       def profile
-        @profile ||= Profile.find(@profileId)
+        @profile ||= Profile.find(@profile_id)
       end
 
       private
@@ -41,14 +41,14 @@ module GoogleApi
         end
 
         def set(goal)
-          @accountId     = goal['accountId']
-          @webPropertyId = goal['webPropertyId']
-          @profileId     = goal['profileId']
-          @value         = goal['value']
-          @active        = goal['active']
-          @type          = goal['type']
-
-          @goal = goal[camelize(@type) + 'Details']
+          self.account_id     = goal['accountId']
+          self.webproperty_id = goal['webPropertyId']
+          self.profile_id     = goal['profileId']
+          self.value          = goal['value']
+          self.active         = goal['active']
+          self.type           = goal['type']
+
+          self.goal = goal[camelize(@type) + 'Details']
 
           super(goal)
         end

data/lib/google_api/ga/management/management.rb

@@ -25,10 +25,10 @@ module GoogleApi
         end
 
         def set(values)
-          @id      = values['id']
-          @name    = values['name']
-          @created = values['created']
-          @updated = values['updated']
+          self.id      = values['id']
+          self.name    = values['name']
+          self.created = values['created']
+          self.updated = values['updated']
         end
 
     end

data/lib/google_api/ga/management/profile.rb

@@ -2,8 +2,8 @@ module GoogleApi
   module Ga
     class Profile < Management
 
-      attr_reader :accountId
-      attr_reader :webPropertyId
+      attr_reader :account_id
+      attr_reader :webproperty_id
       attr_reader :currency
       attr_reader :timezone
 
@@ -23,27 +23,19 @@ module GoogleApi
         @webproperty = nil
         @goals       = nil
 
-        set( Profile.get({ accountId: @accountId, webPropertyId: @webPropertyId, profileId: @id }).first )
+        set( Profile.get({ accountId: @account_id, webPropertyId: @webproperty_id, profileId: @id }).first )
 
         return true
       end
 
       def webproperty
-        @webproperty ||= Webproperty.find(@webpropertyId)
+        @webproperty ||= Webproperty.find(@webproperty_id)
       end
 
       def goals
-        @goals ||= Goal.all(@accountId, @webPropertyId, @id)
+        @goals ||= Goal.all(@account_id, @webproperty_id, @id)
       end
 
-      # def get(parameters, start_date = prev_month, end_date = now, expire = nil)
-      #   Data.get(@id, parameters, start_date, end_date, expire)
-      # end
-
-      # def get!(parameters, start_date = prev_month, end_date = now)
-      #   Data.get!(@id, parameters, start_date, end_date)
-      # end
-
       private
 
         def self.get(parameters = nil)
@@ -51,10 +43,10 @@ module GoogleApi
         end
 
         def set(profile)
-          @accountId     = profile['accountId']
-          @webPropertyId = profile['webPropertyId']
-          @currency      = profile['currency']
-          @timezone      = profile['timezone']
+          self.account_id     = profile['accountId']
+          self.webproperty_id = profile['webPropertyId']
+          self.currency       = profile['currency']
+          self.timezone       = profile['timezone']
 
           super(profile)
         end

data/lib/google_api/ga/management/segment.rb

@@ -2,7 +2,7 @@ module GoogleApi
   module Ga
     class Segment < Management
 
-      attr_accessor :segmentId
+      attr_accessor :segment_id
       attr_accessor :definition
 
       def initialize(segment)
@@ -30,8 +30,8 @@ module GoogleApi
         end
         
         def set(segment)
-          @segmentId  = segment['segmentId']
-          @definition = segment['definition']
+          self.segment_id = segment['segmentId']
+          self.definition = segment['definition']
 
           super(segment)
         end

data/lib/google_api/ga/management/webproperty.rb

@@ -2,8 +2,8 @@ module GoogleApi
   module Ga
     class Webproperty < Management
 
-      attr_reader :accountId
-      attr_reader :websiteUrl
+      attr_reader :account_id
+      attr_reader :website_url
 
       def initialize(webproperty)
         set(webproperty)
@@ -21,17 +21,17 @@ module GoogleApi
         @account  = nil
         @profiles = nil
 
-        set( Webproperty.get({ accountId: @accountId, webPropertyId: @id }).first )
+        set( Webproperty.get({ accountId: @account_id, webPropertyId: @id }).first )
 
         return true
       end
 
       def account
-        @account ||= Account.find(@accountId)
+        @account ||= Account.find(@account_id)
       end
 
       def profiles
-        @profiles ||= Profile.all(@accountId, @id)
+        @profiles ||= Profile.all(@account_id, @id)
       end
 
       private
@@ -41,8 +41,8 @@ module GoogleApi
         end
 
         def set(webproperty)
-          @accountId  = webproperty['accountId']
-          @websiteUrl = webproperty['websiteUrl']
+          self.account_id  = webproperty['accountId']
+          self.website_url = webproperty['websiteUrl']
 
           super(webproperty)
         end

data/lib/google_api/shorten/shorten.rb

@@ -3,14 +3,16 @@ module GoogleApi
 
     CONFIGURATION = {}
 
+    URLSHORTENER_URI = 'https://www.googleapis.com/urlshortener/v1/url'
+
     # Session
     autoload :Session, 'google_api/shorten/session'
 
     # Url
-    autoload :Url, 'google_api/shorten/url/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'
+    autoload :List,   'google_api/shorten/url/list'
+    autoload :Get,    'google_api/shorten/url/get'
 
     def self.insert(url)
       Insert.new(url)

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

@@ -16,17 +16,34 @@ module GoogleApi
           raise GoogleApi::ShortenError, "Invalid projection. Must be #{PROJECTION_LIST.join(',')}."
         end
 
-        get
+        @data = _session.check_session ? get : get_without_login
       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])
+          JSON.parse(_session.client.execute( api_method: _session.api.url.get,
+                                              parameters: { shortUrl: @short_url,
+                                                            projection: @projection } ).body)
         end
-      
+
+        def get_without_login
+          require 'net/http'
+          require 'json'
+
+          uri = URI(Shorten::URLSHORTENER_URI)
+          uri.query = URI.encode_www_form({ shortUrl: @short_url,
+                                            projection: @projection })
+
+          res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            req = Net::HTTP::Get.new(uri.request_uri)
+
+            http.request(req)
+          end
+
+          JSON.parse(res.body)
+        end
+
     end
   end
 end

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

@@ -8,7 +8,7 @@ module GoogleApi
       def initialize(long_url)
         @long_url = long_url
 
-        get
+        @short_url = _session.check_session ? get : get_without_login
       end
 
       def details(projection = 'FULL')
@@ -18,9 +18,26 @@ module GoogleApi
       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
+          _session.client.execute( api_method: _session.api.url.insert,
+                                   body: { longUrl: @long_url }.to_json, 
+                                   headers: {'Content-Type' => 'application/json'} ).data.id
+        end
+
+        def get_without_login
+          require 'net/http'
+          require 'json'
+
+          uri = URI(Shorten::URLSHORTENER_URI)
+
+          req = Net::HTTP::Post.new(uri.path)
+          req.body = {longUrl: @long_url}.to_json
+          req.content_type = 'application/json'
+
+          res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(req)
+          end
+
+          JSON.parse(res.body)['id']
         end
       
     end

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

@@ -3,7 +3,7 @@ module GoogleApi
     class List < Url
 
       def initialize
-        get
+        @data = get
       end
 
       def count
@@ -17,8 +17,10 @@ module GoogleApi
       private
         
         def get
-          @data = JSON.parse(_session.client.execute( api_method: _session.api.url.list,
-                                                      parameters: { projection: 'FULL' } ).response.env[:body])
+          JSON.parse(
+            _session.client.execute( api_method: _session.api.url.list,
+                                     parameters: { projection: 'FULL' } ).body
+          )
         end
 
     end

data/lib/google_api/version.rb

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

data/spec/lib/configuration_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+describe "GoogleApi::Configuration" do
+  it "Dsl" do
+    GoogleApi.configure do
+      client_id "1"
+      client_secret "2"
+      client_developer_email "3"
+
+      ga do
+        client_id "4"
+        client_secret "5"
+        client_developer_email "6"
+      end
+
+      shorten do
+        client_id "7"
+        client_secret "8"
+        client_developer_email "9"
+      end
+    end
+
+    GoogleApi.config.client_id.should eq("1")
+    GoogleApi.config.client_secret.should eq("2")
+    GoogleApi.config.client_developer_email.should eq("3")
+
+    GoogleApi.config.ga.client_id.should eq("4")
+    GoogleApi.config.ga.client_secret.should eq("5")
+    GoogleApi.config.ga.client_developer_email.should eq("6")
+
+    GoogleApi.config.shorten.client_id.should eq("7")
+    GoogleApi.config.shorten.client_secret.should eq("8")
+    GoogleApi.config.shorten.client_developer_email.should eq("9")
+  end
+
+  it "Classic" do
+    GoogleApi.configure do |config|
+      config.client_id "1"
+      config.client_secret "2"
+      config.client_developer_email "3"
+
+      config.ga do |ga_config|
+        ga_config.client_id "4"
+        ga_config.client_secret "5"
+        ga_config.client_developer_email "6"
+      end
+
+      config.shorten do |shorten_config|
+        shorten_config.client_id "7"
+        shorten_config.client_secret "8"
+        shorten_config.client_developer_email "9"
+      end
+    end
+
+    GoogleApi.config.client_id.should eq("1")
+    GoogleApi.config.client_secret.should eq("2")
+    GoogleApi.config.client_developer_email.should eq("3")
+
+    GoogleApi.config.ga.client_id.should eq("4")
+    GoogleApi.config.ga.client_secret.should eq("5")
+    GoogleApi.config.ga.client_developer_email.should eq("6")
+
+    GoogleApi.config.shorten.client_id.should eq("7")
+    GoogleApi.config.shorten.client_secret.should eq("8")
+    GoogleApi.config.shorten.client_developer_email.should eq("9")
+  end
+
+  it "Minimal" do
+    GoogleApi.config.client_id = "1"
+    GoogleApi.config.client_secret = "2"
+    GoogleApi.config.client_developer_email = "3"
+
+    GoogleApi.config.ga.client_id = "4"
+    GoogleApi.config.ga.client_secret = "5"
+    GoogleApi.config.ga.client_developer_email = "6"
+
+    GoogleApi.config.shorten.client_id = "7"
+    GoogleApi.config.shorten.client_secret = "8"
+    GoogleApi.config.shorten.client_developer_email = "9"
+
+    GoogleApi.config.client_id.should eq("1")
+    GoogleApi.config.client_secret.should eq("2")
+    GoogleApi.config.client_developer_email.should eq("3")
+
+    GoogleApi.config.ga.client_id.should eq("4")
+    GoogleApi.config.ga.client_secret.should eq("5")
+    GoogleApi.config.ga.client_developer_email.should eq("6")
+
+    GoogleApi.config.shorten.client_id.should eq("7")
+    GoogleApi.config.shorten.client_secret.should eq("8")
+    GoogleApi.config.shorten.client_developer_email.should eq("9")
+  end
+end

data/spec/lib/{google_api_ga_data_spec.rb → ga_data_spec.rb}

@@ -87,14 +87,44 @@ describe "GoogleApi::Ga::Data" do
 
 
 
-  # Date add and sub
+  # Save parameters
+  # -------------------------------------------------------------------------------------------------
+  it "save parameters" do
+    @data = @data.id(1)
+                 .from(Date.today)
+                 .to(Date.today)
+                 .select(:visits)
+                 .with(:day, :month, "ga:year")
+                 .where("country==Czech Republic")
+                 .offset(1)
+                 .limit(1)
+
+    @data.id.should eql(1)
+    @data.from.should eql(Date.today)
+    @data.to.should eql(Date.today)
+    @data.select.should eql(["ga:visits"])
+    @data.with.should eql(["ga:day", "ga:month", "ga:year"])
+    @data.where.should eql("country==Czech Republic")
+    @data.offset.should eql(1)
+    @data.limit.should eql(1)
+  end
+
+
+
+  # Date add
   # -------------------------------------------------------------------------------------------------
   it "date add and sub" do
     @data = @data.start_date(+30).end_date(+30)
 
     @data.start_date.should eql(Date.today + 30)
     @data.end_date.should eql(Date.today + 30)
+  end
+
 
+
+  # Date sub
+  # -------------------------------------------------------------------------------------------------
+  it "date add and sub" do
     @data = @data.start_date(Date.today).end_date(Date.today)
     @data = @data.start_date(-30).end_date(-30)
 

data/spec/lib/shorten_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe "GoogleApi::Shorten" do
+  it "Get." do
+    get = GoogleApi::Shorten.get('http://goo.gl/dOpuw')
+
+    get.data['id'].should eql('http://goo.gl/dOpuw')
+    get.data['longUrl'].should eql('https://github.com/ondra-m/google_api')
+  end
+
+  it "Insert short_url is nil if long_url isn't right url." do
+    insert = GoogleApi::Shorten.insert('google_api')
+
+    insert.short_url.should eql(nil)
+  end
+
+  it "List shour raise error." do
+    lambda { GoogleApi::Shorten.list }.should raise_error(GoogleApi::SessionError)
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -78,7 +78,6 @@ files:
 - lib/google_api.rb
 - lib/google_api/cache.rb
 - lib/google_api/configuration.rb
-- lib/google_api/core_ext/hash.rb
 - lib/google_api/core_ext/string.rb
 - lib/google_api/ga/data.rb
 - lib/google_api/ga/data/data_dsl.rb
@@ -101,10 +100,11 @@ files:
 - 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
-- spec/lib/google_api_ga_spec.rb
-- spec/lib/google_api_spec.rb
+- spec/lib/cache_spec.rb
+- spec/lib/configuration_spec.rb
+- spec/lib/ga_data_spec.rb
+- spec/lib/ga_spec.rb
+- spec/lib/shorten_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ondra-m/google_api
 licenses: []
@@ -121,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -131,9 +131,10 @@ signing_key:
 specification_version: 3
 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
-- spec/lib/google_api_ga_spec.rb
-- spec/lib/google_api_spec.rb
+- spec/lib/cache_spec.rb
+- spec/lib/configuration_spec.rb
+- spec/lib/ga_data_spec.rb
+- spec/lib/ga_spec.rb
+- spec/lib/shorten_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/google_api/core_ext/hash.rb

@@ -1,11 +0,0 @@
-unless Hash.new.respond_to?(:symbolize_keys!)
-  class Hash
-    def symbolize_keys!
-      keys.each do |key|
-        self[(key.to_sym rescue key) || key] = delete(key)
-      end
-      
-      self
-    end
-  end
-end

data/spec/lib/google_api_spec.rb

@@ -1,61 +0,0 @@
-require "spec_helper"
-
-describe "GoogleApi::Configuration" do
-  it "Setting is right." do
-    GoogleApi.configure do
-      client_id "1"
-      client_secret "2"
-      client_developer_email "3"
-
-      ga do
-        client_id "4"
-        client_secret "5"
-        client_developer_email "6"
-      end
-    end
-
-    GoogleApi.config.client_id.should eq("1")
-    GoogleApi.config.client_secret.should eq("2")
-    GoogleApi.config.client_developer_email.should eq("3")
-
-    GoogleApi.config.ga.client_id.should eq("4")
-    GoogleApi.config.ga.client_secret.should eq("5")
-    GoogleApi.config.ga.client_developer_email.should eq("6")
-
-    GoogleApi.configure do |config|
-      config.client_id "7"
-      config.client_secret "8"
-      config.client_developer_email "9"
-
-      config.ga do |ga_config|
-        ga_config.client_id "10"
-        ga_config.client_secret "11"
-        ga_config.client_developer_email "12"
-      end
-    end
-
-    GoogleApi.config.client_id.should eq("7")
-    GoogleApi.config.client_secret.should eq("8")
-    GoogleApi.config.client_developer_email.should eq("9")
-
-    GoogleApi.config.ga.client_id.should eq("10")
-    GoogleApi.config.ga.client_secret.should eq("11")
-    GoogleApi.config.ga.client_developer_email.should eq("12")
-
-    GoogleApi.config.client_id = "13"
-    GoogleApi.config.client_secret = "14"
-    GoogleApi.config.client_developer_email = "15"
-
-    GoogleApi.config.ga.client_id = "16"
-    GoogleApi.config.ga.client_secret = "17"
-    GoogleApi.config.ga.client_developer_email = "18"
-
-    GoogleApi.config.client_id.should eq("13")
-    GoogleApi.config.client_secret.should eq("14")
-    GoogleApi.config.client_developer_email.should eq("15")
-
-    GoogleApi.config.ga.client_id.should eq("16")
-    GoogleApi.config.ga.client_secret.should eq("17")
-    GoogleApi.config.ga.client_developer_email.should eq("18")
-  end
-end