citygrid_api 0.0.26 → 0.0.27

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/citygrid_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "citygrid_api"
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elpizo Choi"]
-  s.date = "2013-02-26"
+  s.date = "2013-07-18"
   s.description = "Ruby wrapper for CityGrid APIs"
   s.email = "fu7iin@gmail.com"
   s.extra_rdoc_files = [
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
     "lib/citygrid/api/accounts.rb",
     "lib/citygrid/api/accounts/account.rb",
     "lib/citygrid/api/accounts/authentication.rb",
+    "lib/citygrid/api/accounts/login.rb",
     "lib/citygrid/api/accounts/method_of_payment.rb",
     "lib/citygrid/api/accounts/temp_impersonation.rb",
     "lib/citygrid/api/accounts/user.rb",

data/lib/citygrid.rb

@@ -70,7 +70,7 @@ class CityGrid
     end
     
     def authenticate params
-      API::Accounts::User.login params
+      API::Accounts::Login.login params
     end
     alias_method :login, :authenticate
     
@@ -96,6 +96,7 @@ class CityGrid
             # if value is a plain String, that's the endpoint
             endpoint = v.start_with?("/") ? v : "/#{v}"
             klass.endpoint endpoint
+            klass.newendpoint endpoint
             klass.base_uri default_hostname
           elsif v.is_a? Hash
             # if value is a Hash, fetch endpoint
@@ -103,9 +104,13 @@ class CityGrid
             # otherwise if ssl is set then use ssl_hostname. fallback to default_hostname
             hostname = v["hostname"] || (v["ssl"] ? ssl_hostname : default_hostname)
             throw ParseConfigurationError.new file_path, "No endpoint defined for #{k}" unless v["endpoint"]
+             newendpoint = v["newendpoint"] ? v["newendpoint"] : v["endpoint"] 
             endpoint = v["endpoint"].start_with?("/") ? v["endpoint"] : "/#{v["endpoint"]}" 
+           
+            newendpoint = newendpoint.start_with?("/") ? newendpoint : "/#{newendpoint}" 
             klass.endpoint endpoint
             klass.base_uri hostname
+            klass.newendpoint newendpoint
           else 
             # should not get here. value should be String or Hash
             throw ParseConfigurationError.new file_path, "Invalid value type for #{k}"
@@ -160,4 +165,4 @@ require "citygrid/api/advertising"
 require "citygrid/api/ads"
 require "citygrid/api/content"
 
-require "request_ext"
+require "request_ext"

data/lib/citygrid/api.rb

@@ -62,6 +62,11 @@ class CityGrid
         @endpoint = val
       end
 
+      def newendpoint val = nil
+        return @newendpoint unless val
+        @newendpoint = val
+      end
+
       def request options = {}
         method = (options.delete(:method) || :get).to_sym
         query  = options.merge :format => :json

data/lib/citygrid/api/accounts/login.rb

@@ -0,0 +1,14 @@
+class CityGrid
+  class API
+    class Accounts
+      class Login < Accounts
+        def self.login options = {}
+          request_and_handle :post,
+            "#{endpoint}/login",
+            :query => options,
+            :headers => merge_headers()
+        end
+      end
+    end
+  end
+end

data/lib/citygrid/api/accounts/user.rb

@@ -5,12 +5,12 @@ class CityGrid
         include CityGrid::API::Mutable
         include CityGrid::API::Searchable
         
-        def self.login options = {}
-          request_and_handle :post,
-            "#{endpoint}/login",
-            :query => options,
-            :headers => merge_headers()
-        end
+        # def self.login options = {}
+        #   request_and_handle :post,
+        #     "#{endpoint}/login",
+        #     :query => options,
+        #     :headers => merge_headers()
+        # end
         
         # login behaves weird right now - expects string as body, not json encoded. 
         # define_action :login, :post, "login", :auth_token => false, :format => false        
@@ -19,4 +19,4 @@ class CityGrid
       end
     end
   end
-end
+end

data/lib/citygrid/session.rb

@@ -26,7 +26,7 @@ class CityGrid
     end
     
     def login username, password
-      res = CityGrid::API::Accounts::User.login :username => username, :password => password
+      res = CityGrid::API::Accounts::Login.login :username => username, :password => password
       self.username = username
 
 
@@ -58,4 +58,4 @@ class CityGrid
       end
     end
   end
-end
+end

metadata

@@ -1,127 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: citygrid_api
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.27
   prerelease: 
-  version: 0.0.26
 platform: ruby
-authors: 
+authors:
 - Elpizo Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-26 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: riot
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: riot
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.12.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.4
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for CityGrid APIs
 email: fu7iin@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .sass-cache/7a5a675d951455410512a59af5ab2d160bd1735c/test.scssc
 - .sass-cache/c6f2c767b164f077e5b9fb1f18a7886d7c755211/test.scssc
@@ -184,6 +225,7 @@ files:
 - lib/citygrid/api/accounts.rb
 - lib/citygrid/api/accounts/account.rb
 - lib/citygrid/api/accounts/authentication.rb
+- lib/citygrid/api/accounts/login.rb
 - lib/citygrid/api/accounts/method_of_payment.rb
 - lib/citygrid/api/accounts/temp_impersonation.rb
 - lib/citygrid/api/accounts/user.rb
@@ -274,33 +316,29 @@ files:
 - views/_test_result.haml
 - views/stylesheets/test.scss
 - views/test.haml
-has_rdoc: true
 homepage: 
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for CityGrid APIs
 test_files: []
-