masheri 0.1.1 → 0.2.0

data/Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
+gem 'activesupport', "3.0.0"
 gem 'thor'
 gem 'httparty'
-gem 'activesupport'
 gem 'json'

data/Gemfile.lock

@@ -12,7 +12,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (= 3.0.0)
   httparty
   json
   thor

data/Rakefile

@@ -1,16 +1,15 @@
 begin
   require 'jeweler'
-  require './lib/masheri/version.rb'
+  Jeweler::RubygemsDotOrgTasks.new
+
   Jeweler::Tasks.new do |gemspec|
     gemspec.name     = "masheri"
     gemspec.summary  = "Rails gem for Mashery. Clean config and includes tests."
     gemspec.email    = "farleyknight@gmail.com"
     gemspec.homepage = "http://github.com/farleyknight/masheri"
     gemspec.authors  = ["Farley Knight"]
-    gemspec.version  = Masheri::Version::STRING
     gemspec.license  = "MIT"
   end
-  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError => error
   puts error
 end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/masheri.rb

@@ -9,14 +9,24 @@ require 'masheri/key'
 require 'masheri/role'
 require 'masheri/query'
 
+if defined?(Rails)
+  require 'masheri/rails'
+end
+
 module Masheri
   mattr_accessor :client
   @@client = nil
 
   mattr_accessor :logger, :instance_writer => false
+  # TODO: Handle possible Rails logger.
   @@logger = Logger.new(STDOUT)
   @@logger.level = Logger::WARN
 
   mattr_accessor :test_mode, :instance_writer => false
-  @@test_mode = true
+  @@test_mode = false
+
+  def self.load_config!(yaml_file)
+    Masheri.client = Masheri::Client.from_yaml(yaml_file)
+  end
 end
+

data/lib/masheri/client.rb

@@ -1,17 +1,24 @@
 require 'active_support'
 require 'json'
 require 'httparty'
-require 'md5'
+require 'digest/md5'
 
 module Masheri
   class Client
     TEST_HOST = 'api.sandbox.mashery.com'
     PRODUCTION_HOST = 'api.mashery.com'
 
+    def self.from_yaml(yaml_file)
+      config = YAML.load_file(yaml_file)
+      new(config["site_id"], config["key"], config["secret"])
+    end
+
+    attr_accessor :uri, :key, :secret
+
     def initialize(site_id, key, secret)
-      host = Masheri.test_mode ? TEST_HOST : PRODUCTION_HOST
-      @uri = "http://#{host}/v2/json-rpc/#{site_id}"
-      @key = key
+      host    = Masheri.test_mode ? TEST_HOST : PRODUCTION_HOST
+      @uri    = "http://#{host}/v2/json-rpc/#{site_id}"
+      @key    = key
       @secret = secret
     end
 
@@ -19,22 +26,36 @@ module Masheri
       call_remote('test.echo', value)
     end
 
-    def call_remote(method, *params)
+    def perform(params)
       # all calls are synchronous, so id in request and response will always be 1
       if Masheri.logger
-        Masheri.logger.debug("Calling method #{method} with params #{params.inspect} on URI #{signed_uri}")
+        Masheri.logger.debug("Calling query with params #{params.inspect} on URI #{full_url}")
       end
-      req = ::JSON[{:version => '1.1', :method => method, :params => params, :id => 1}]
-      response = HTTParty.post(signed_uri, :body => req)
-      raise HttpException.new(response.headers['x-mashery-error-code']) unless response.code < 300
-      res = ::JSON[response.body]
-      raise Exception.create(res['error']) if res.include?('error')
-      res['result']
+
+      response = RestClient.post(full_url, params.to_json, {
+                                   "Content-Type"   => "application/json",
+                                   "Accept"         => "text/plain",
+                                   "Content-Length" => params.size
+                                 })
+
+      JSON.parse response
+    end
+
+    def query(string)
+      call_remote("object.query", params: string)
+    end
+
+    def call_remote(method, opts = {})
+      perform({'method' => method, 'params'=> [opts[:params]], 'id' => 1})
+    end
+
+    def create(type, params)
+      call_remote("#{type}.create")
     end
 
     protected
-    def signed_uri
-      "#{@uri}?apikey=#{@key}&sig=#{MD5.new(@key + @secret + Time.now.to_i.to_s).hexdigest}"
+    def full_url
+      "#{@uri}?apikey=#{@key}&sig=#{Digest::MD5.hexdigest(@key + @secret + Time.now.to_f.to_i.to_s)}"
     end
   end
 end

data/lib/masheri/init.rb

@@ -0,0 +1,2 @@
+
+Masheri.load_rails_config!

data/lib/masheri/member.rb

@@ -1,9 +1,11 @@
 module Masheri
   class Member < ApiObjectBase
     attr_reader :created, :updated
+
     attr_accessor(:username, :email, :display_name, :uri, :blog, :im, :imsvc, :phone,
-                  :company, :address1, :address2, :locality, :region, :postal_code, :country_code, :first_name, :last_name,
-                  :registration_ipaddr, :area_status, :external_id, :passwd_new)
+                  :company, :address1, :address2, :locality, :region, :postal_code,
+                  :country_code, :first_name, :last_name, :registration_ipaddr, :area_status,
+                  :external_id, :passwd_new)
 
     def self.create(username, display_name, email, fields = {})
       fields ||= {}
@@ -11,6 +13,14 @@ module Masheri
       super(our_fields)
     end
 
+    def self.fetch_all
+      Masheri.client.call_remote("object.query", params: "SELECT * FROM members")
+    end
+
+    def self.fetch_by_username(username)
+      Masheri.client.call_remote("object.query", params: "SELECT * FROM members WHERE username = '#{username}'")
+    end
+
     def add_role(role_or_id)
       role_id = role_or_id.is_a?(Role) ? role_or_id.id : role_or_id
       Masheri.client.call_remote('member.addRole', {'username' => username}, {'id' => role_id})

data/lib/masheri/query.rb

@@ -45,7 +45,7 @@ module Masheri
 
     # Page through the results. Due heavy use of the API, this method
     # takes a qps parameter to control how often the API is called.
-    def fetch_all(qps=DEFAULT_QUERIES_PER_SECOND)
+    def fetch_all(qps = DEFAULT_QUERIES_PER_SECOND)
       response = execute
       items = response['items']
 

data/lib/masheri/rails.rb

@@ -0,0 +1,21 @@
+module Masheri
+  class MissingConfig < Exception; end
+
+  def self.load_rails_config!
+    if File.exists? rails_config
+      load_config! rails_config
+    else
+      raise MissingConfig.new("Couldn't find config/masheri.yml! Please run rails g masheri:install to create one and populate it with the necessary API credentials.")
+    end
+  end
+
+  def self.rails_config
+    Rails.root.join("config", "masheri.yml")
+  end
+
+  class Engine < ::Rails::Engine
+    initializer "load_masheri_config" do
+      Masheri.load_rails_config!
+    end
+  end
+end

data/masheri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "masheri"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Farley Knight"]
-  s.date = "2013-09-04"
+  s.date = "2013-09-05"
   s.email = "farleyknight@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -28,11 +28,12 @@ Gem::Specification.new do |s|
     "lib/masheri/api_object_base.rb",
     "lib/masheri/client.rb",
     "lib/masheri/exceptions.rb",
+    "lib/masheri/init.rb",
     "lib/masheri/key.rb",
     "lib/masheri/member.rb",
     "lib/masheri/query.rb",
+    "lib/masheri/rails.rb",
     "lib/masheri/role.rb",
-    "lib/masheri/version.rb",
     "masheri.gemspec",
     "tasks/mashery.thor"
   ]
@@ -46,20 +47,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, ["= 3.0.0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, ["= 3.0.0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, ["= 3.0.0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masheri
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -95,11 +95,12 @@ files:
 - lib/masheri/api_object_base.rb
 - lib/masheri/client.rb
 - lib/masheri/exceptions.rb
+- lib/masheri/init.rb
 - lib/masheri/key.rb
 - lib/masheri/member.rb
 - lib/masheri/query.rb
+- lib/masheri/rails.rb
 - lib/masheri/role.rb
-- lib/masheri/version.rb
 - masheri.gemspec
 - tasks/mashery.thor
 homepage: http://github.com/farleyknight/masheri
@@ -115,6 +116,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3621785355693449407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/masheri/version.rb

@@ -1,9 +0,0 @@
-module Masheri
-  module Version
-    MAJOR = 0
-    MINOR = 1
-    PATCH = 1
-
-    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
-  end
-end