masheri 0.3.1 → 0.3.4

data/README.md

@@ -1,3 +1,58 @@
+# masheri
 
+A Rails library for the [Mashery API](http://support.mashery.com/docs/mashery_api).
+
+## Installation
+
+Add the following to your `Gemfile`
+
+```ruby
+gem "masheri"
+```
+
+Then run the installer to create `config/masheri.yml`
+
+```bash
+$ rails g masheri:install
+```
+
+## Configuration
+
+Edit `config/masheri.yml` with your `site_key`, `api_key` and `shared_secret` options.
+
+
+
+```yaml
+development:
+  site_id: 123
+  api_key: abc
+  shared_secret: xyz
+
+test:
+  site_id: 123
+  api_key: abc
+  shared_secret: xyz
+
+production:
+  site_id: 123
+  api_key: abc
+  shared_secret: xyz
+```
+
+## Usage
+
+
+### Members
+
+```ruby
+Masheri::Member.fetch_all #=>
+```
+
+### ???
+
+
+### ???
+
+
+### ???
 
-Fix this!

data/lib/masheri.rb

@@ -1,32 +1,68 @@
-require 'active_support/core_ext/module/attribute_accessors'
+$LOAD_PATH.unshift File.expand_path("./lib")
+
+require 'active_support/core_ext'
 require 'logger'
+require 'digest/md5'
+require 'restclient'
 
 require 'masheri/exceptions'
-require 'masheri/client'
+require 'masheri/config'
+require 'masheri/query_builder'
+require 'masheri/query_methods'
+
+require 'masheri/rpc_client'
+require 'masheri/rest_client'
+require 'masheri/rest_client/query'
+
 require 'masheri/api_object_base'
+
 require 'masheri/member'
+require 'masheri/service'
 require 'masheri/key'
 require 'masheri/role'
 require 'masheri/query'
 
-if defined?(Rails)
-  require 'masheri/rails'
-end
-
 module Masheri
-  mattr_accessor :client
-  @@client = nil
+  @@config = nil
 
-  mattr_accessor :logger, :instance_writer => false
-  # TODO: Handle possible Rails logger.
-  @@logger = Logger.new(STDOUT)
-  @@logger.level = Logger::WARN
+  def self.config
+    raise Masheri::ConfigMissing.new unless @@config.present?
+    @@config
+  end
 
-  mattr_accessor :test_mode, :instance_writer => false
-  @@test_mode = false
+  def self.config=(other)
+    @@config = other
+  end
 
   def self.load_config!(yaml_file)
-    Masheri.client = Masheri::Client.from_yaml(yaml_file)
+    Masheri.config = Masheri::Config.new(yaml_file)
+  end
+
+  def self.local_config
+    File.expand_path("~/.masheri.yml")
+  end
+
+  def self.rpc
+    Masheri::RpcClient.new
+  end
+
+  def self.rest
+    Masheri::RestClient.new
+  end
+
+  def self.developer_activity(service_id, options)
+    Masheri.rest.developer_activity(service_id, options)
   end
 end
 
+# TODO: Let config be accepted as command line argument
+# (masheri -C config.yml)
+if defined?(Rails)
+  require 'masheri/rails'
+elsif File.exists?(Masheri.local_config)
+  Masheri.load_config! Masheri.local_config
+elsif defined?(RSpec)
+  # Skip testing environment..
+else
+  raise Masheri::MissingConfig.new
+end

data/lib/masheri/api_object_base.rb

@@ -1,12 +1,14 @@
 module Masheri
   class ApiObjectBase
+    mattr_accessor :type_name
+
     def self.create(fields = {})
       # XXX: only send fields that aren't read-only
       new(Masheri.client.call_remote(method('create'), fields))
     end
 
     def self.fetch(id)
-      data = Masheri.client.call_remote(method('fetch'), id)
+      data = Masheri.rpc.call_remote(method('fetch'), id)
       data.nil?? nil : new(data)
     end
 

data/lib/masheri/config.rb

@@ -0,0 +1,71 @@
+module Masheri
+  class Config
+    DEFAULT_HOSTS = {
+      test:       'api.sandbox.mashery.com',
+      production: 'api.mashery.com'
+    }
+
+    attr_accessor :config
+
+    def initialize(yaml_file)
+      @config ||= YAML.load_file(yaml_file)
+      check_config!
+    end
+
+    def check_config!
+      if config["site_id"].blank?
+        raise ParamMissing.new("site_id")
+      end
+
+      if config["key"].blank?
+        raise ParamMissing.new("key")
+      end
+
+      if config["secret"].blank?
+        raise ParamMissing.new("secret")
+      end
+
+      find_host!
+    end
+
+    def site_id
+      @site_id ||= config["site_id"]
+    end
+
+    def key
+      @key     ||= config["key"]
+    end
+
+    alias :api_key :key
+
+    def secret
+      @secret  ||= config["secret"]
+    end
+
+    def host
+      @host    ||= find_host!
+    end
+
+    def signature
+      Digest::MD5.hexdigest(key + secret + Time.now.to_f.to_i.to_s)
+    end
+
+    protected
+
+    def find_host!
+      if config["host"].present?
+        config["host"]
+      else
+        if defined?(Rails)
+          if Rails.env.test? || Rails.env.development?
+            DEFAULT_HOSTS[:test]
+          elsif Rails.env.production?
+            DEFAULT_HOSTS[:production]
+          end
+        end
+
+        raise ParamMissing.new("host")
+      end
+    end
+  end
+end

data/lib/masheri/exceptions.rb

@@ -1,27 +1,45 @@
 module Masheri
-  class Exception < ::Exception
-    def self.create(options = {})
-      case options['code']
-      when 1000 then ValidationException.new(options['data'])
-      when 1001 then DuplicateObjectException.new("#{options['message']} (JSON-RPC error #{options['code']})")
-      else JsonRpcException.new("#{options['message']} (JSON-RPC error #{options['code']})")
-      end
+  class InvalidDateRange < Exception
+    def initialize(start_date, end_date)
+      days = ((end_date - start_date) / 1.day).ceil
+
+      super("Your start_date and end_date are #{days} days apart. Mashery's API does not like date ranges that span longer than 7 days. Please use multiple queries to gather your data.")
     end
   end
 
-  class HttpException < Exception
+  class QueryParamMissing < Exception
+    def initialize(param)
+      super "Couldn't complete request. The query param #{param} is missing."
+    end
   end
 
-  class JsonRpcException < Exception
+  class ParamMissing < Exception
+    def initialize(param)
+      super "Couldn't determine Mashery #{param}! Please check your config/masheri.yml"
+    end
   end
 
-  class DuplicateObjectException < Exception
+  class ConfigMissing < Exception
+    def initialize
+      super "No configuration has been loaded! Please call Masheri.load_config! with a valid Yaml file."
+    end
+  end
+
+  class MissingConfig < Exception
+    def initialize
+      if defined?(Rails)
+        super("Couldn't find config/masheri.yml! \n" +
+              "Please run `rails g masheri:install` to create one and populate it with the necessary API credentials.")
+      else
+        super("Couldn't find ~/.masheri.yml! \n" +
+              "Please run `masheri --init` to create one and populate it with the necessary API credentials.")
+      end
+    end
   end
 
-  class ValidationException < Exception
-    attr_reader :errors
-    def initialize(errs= {})
-      @errors = errs
+  class UnknownFormat < Exception
+    def initialize(format)
+      super "Unknown format #{format} for REST API call. Standard formats are CSV and JSON."
     end
   end
 end

data/lib/masheri/init.rb

@@ -1,2 +1,7 @@
 
-Masheri.load_rails_config!
+class Masheri
+  # Used by the command line tool
+  class Init
+
+  end
+end

data/lib/masheri/local.rb

@@ -0,0 +1,3 @@
+
+
+

data/lib/masheri/member.rb

@@ -1,12 +1,5 @@
 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)
-
     def self.create(username, display_name, email, fields = {})
       fields ||= {}
       our_fields = fields.merge('username' => username, 'display_name' => display_name, 'email' => email)
@@ -14,11 +7,11 @@ module Masheri
     end
 
     def self.fetch_all
-      Masheri.client.call_remote("object.query", params: "SELECT * FROM members")
+      Masheri::RpcClient.new.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}'")
+      Masheri::RpcClient.new.call_remote("member.fetch", params: username)
     end
 
     def add_role(role_or_id)

data/lib/masheri/query.rb

@@ -1,3 +1,8 @@
+#
+# This class handles this aspect of the API:
+#
+# http://support.mashery.com/docs/read/mashery_api/20/Query_Language
+#
 module Masheri
   class Query
     OBJECT_TYPES = ['members', 'keys', 'services', 'roles', 'applications']

data/lib/masheri/query_builder.rb

@@ -0,0 +1,170 @@
+module Masheri
+  class QueryBuilder
+    attr_accessor :klass
+
+    def initialize(klass, options = {})
+      @klass      = klass
+      @options    = options
+      @conditions = Where.new
+      @select     = Select.new
+    end
+
+    def select(argument)
+      @select = Select.new(argument)
+      clone
+    end
+
+    def from(argument)
+      @from = From.new(argument)
+      clone
+    end
+
+    def where(argument)
+      @conditions.add argument
+      clone
+    end
+
+    def order(column, order)
+      @order = Order.new(column, order)
+      clone
+    end
+
+    def items(argument)
+      @items = Items.new(argument)
+      clone
+    end
+
+    def page(argument)
+      @page = Page.new(argument)
+      clone
+    end
+
+    def query
+      [@select, @from, @order, @conditions, @page, @items].map(&:to_s).reject {|s|
+        s.blank?
+      }.compact.join(" ").strip
+    end
+
+    alias :to_s :query
+
+    def to_json
+      Masheri.rpc.query(query)
+    end
+
+    def all
+      Masheri::RpcResponse.new(self)
+    end
+
+    def find_each(&block)
+      Masheri::RpcResponse.new(self).find_each(&block)
+    end
+
+    def first
+      Masheri::RpcResponse.new(items(1)).to_objects.first
+    end
+
+    protected
+
+    class Select
+      def initialize(argument = nil)
+        @argument = argument
+      end
+
+      def query
+        @argument || "*"
+      end
+
+      def to_s
+        "SELECT #{query}"
+      end
+    end
+
+    class From
+      def initialize(argument)
+        @argument = argument
+      end
+
+      def to_s
+        raise MissingFrom.new if @argument.nil?
+        "FROM #{@argument}"
+      end
+    end
+
+    class Where
+      def initialize(hash = {})
+        @hash = hash
+      end
+
+      def add(hash)
+        @hash.merge!(hash)
+      end
+
+      def to_s
+        if @hash.blank?
+          ""
+        else
+          "WHERE #{compute_relation}"
+        end
+      end
+
+      def compute_relation
+        @hash.map do |key, value|
+          if value.is_a? String
+            "#{key} = '#{value}'"
+          else
+            "#{key} = #{value}"
+          end
+        end.join(" AND ")
+      end
+    end
+
+    # An ASC or DESC modifier may appear after each field in the ORDER BY list.  If no modifer appears, ASC is assumed.
+    # > SELECT * FROM members ORDER BY created DESC
+    class Order
+      def initialize(column, order)
+        @column = column
+        @order  = order
+      end
+
+      def to_s
+        if @column.blank? || @order.blank?
+          ""
+        else
+          "ORDER BY #{@column} #{@desc}"
+        end
+      end
+    end
+
+    # the ITEMS clause can specify an alternative number of records to return per page.
+    # > SELECT * FROM members ITEMS 25
+    class Items
+      def initialize(count)
+        @count = count
+      end
+
+      def to_s
+        if @count.blank?
+          ""
+        else
+          "ITEMS #{@count}"
+        end
+      end
+    end
+
+    # By default the first page is returned.  The PAGE clause allows additional pages to be returned.
+    # > SELECT * FROM members PAGE 5
+    class Page
+      def initialize(page)
+        @page = page
+      end
+
+      def to_s
+        if @page.blank?
+          ""
+        else
+          "PAGE #{@page}"
+        end
+      end
+    end
+  end
+end

data/lib/masheri/query_methods.rb

@@ -0,0 +1,39 @@
+module Masheri
+  module QueryInstanceMethods
+    def initialize(attributes)
+      attributes.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+  end
+
+  module QueryClassMethods
+    def items(argument)
+      default_query.items(argument)
+    end
+
+    def where(argument)
+      default_query.where(argument)
+    end
+
+    def page(argument)
+      default_query.page(argument)
+    end
+
+    def find_each(&block)
+      default_query.find_each(&block)
+    end
+
+    def standard_query
+      Masheri.rpc.query_builder(self).from(object_type).items(100)
+    end
+
+    def default_query
+      standard_query
+    end
+
+    def first
+      Masheri::Service.new standard_query.items(1).all.items[0]
+    end
+  end
+end

data/lib/masheri/rails.rb

@@ -1,11 +1,10 @@
 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.")
+      raise MissingConfig.new
     end
   end
 

data/lib/masheri/rest_client.rb

@@ -0,0 +1,30 @@
+module Masheri
+  class RestClient
+    def config
+      Masheri.config
+    end
+
+    def developer_activity_query(service_id, options)
+      query_options = {service_id: service_id, resource: "developer_activity"}.merge(options)
+      Masheri::RestClient::Query.new(query_options)
+    end
+
+    def developer_activity_url(service_id, options)
+      query = developer_activity_query(service_id, options)
+      query.url
+    end
+
+    def developer_activity(service_id, options)
+      query    = developer_activity_query(service_id, options)
+      response = ::RestClient.get(query.url)
+
+      if query.format == "json"
+        JSON.parse(response)
+      elsif query.format == "csv"
+        response
+      else
+        raise UnknownFormat.new(query.format)
+      end
+    end
+  end
+end

data/lib/masheri/rest_client/query.rb

@@ -0,0 +1,74 @@
+module Masheri
+  class RestClient
+    class Query
+      def initialize(options)
+        @options  = options
+      end
+
+      def format
+        @options[:format] || "csv"
+      end
+
+      def limit
+        @options[:limit] || 1000
+      end
+
+      def start_date
+        @options[:start_date].strftime("%Y-%m-%dT00:00:00Z")
+      end
+
+      def end_date
+        @options[:end_date].strftime("%Y-%m-%dT00:00:00Z")
+      end
+
+      def check_params!
+        raise QueryParamMissing.new("end_date")   if @options[:end_date].blank?
+        raise QueryParamMissing.new("start_date") if @options[:start_date].blank?
+      end
+
+      def check_dates!
+        if @options[:end_date] - @options[:start_date] > 7.days
+          raise InvalidDateRange.new(@options[:start_date], @options[:end_date])
+        end
+      end
+
+      def params
+        check_params!
+        check_dates!
+
+        params = {
+          start_date: start_date,
+          end_date:   end_date,
+          format:     format,
+          limit:      limit,
+          apikey:     config.key,
+          sig:        config.signature
+        }
+      end
+
+      def config
+        Masheri.config
+      end
+
+      def query_params
+        URI.encode_www_form(params).gsub("%3A", ":")
+      end
+
+      def service_id
+        @options[:service_id]
+      end
+
+      def resource
+        @options[:resource]
+      end
+
+      def path
+        "/v2/rest/#{config.site_id}/reports/calls/#{resource}/service/#{service_id}"
+      end
+
+      def url
+        URI::HTTP.build(host: config.host, path: path, query: query_params).to_s
+      end
+    end
+  end
+end

data/lib/masheri/rpc_client.rb

@@ -0,0 +1,130 @@
+module Masheri
+  class RpcResponse
+    def initialize(query_builder)
+      @query_builder = query_builder
+      @json          = query_builder.to_json
+    end
+
+    def result
+      @json["result"]
+    end
+
+    def error
+      @json["error"]
+    end
+
+    def items
+      result["items"]
+    end
+
+    def to_objects
+      items.map do |item|
+        @query_builder.klass.new(item)
+      end
+    end
+
+    def find_each(&block)
+      items.each(&block)
+
+      if next_page?
+        response = next_page!
+        response.find_each(&block)
+      end
+    end
+
+    def error?
+      error.present?
+    end
+
+    def length
+      items.length
+    end
+
+    def more_pages?
+      current_page < total_pages
+    end
+
+    alias :next_page? :more_pages?
+
+    def next_page_number
+      current_page + 1
+    end
+
+    # Can't call Mashery too many times, or they get mad
+    MASHERY_WAIT_TIME = 0.1
+
+    def next_page!
+      sleep(MASHERY_WAIT_TIME)
+      RpcResponse.new(@query_builder.page(next_page_number))
+    end
+
+    def total_items
+      result["total_items"]
+    end
+
+    def total_pages
+      result["total_pages"]
+    end
+
+    def current_page
+      result["current_page"]
+    end
+
+    def items_per_page
+      result["items_per_page"]
+    end
+  end
+
+  class RpcClient
+    def config
+      Masheri.config
+    end
+
+    # Test Mashery API with echo service
+    def echo(value)
+      call_remote('test.echo', value)
+    end
+
+    def query_builder(klass)
+      Masheri::QueryBuilder.new(klass)
+    end
+
+    # Use the Mashery query language to grab data
+    def query(string)
+      call_remote("object.query", params: string)
+    end
+
+    # Create an object
+    def create(type, params)
+      # TODO: Handle params!
+      call_remote [type_name, "create"].join('.')
+    end
+
+    def call_remote(method, opts = {})
+      perform('method' => method, 'params' => Array(opts[:params]), 'id' => 1)
+    end
+
+    protected
+
+    def perform(params)
+      JSON.parse(post!(full_url, params))
+    end
+
+    def post!(full_url, params)
+      ::RestClient.post(full_url, params.to_json, {
+                          "Content-Type"   => "application/json",
+                          "Accept"         => "text/plain",
+                          "Content-Length" => params.size
+                        })
+    end
+
+    def full_url
+      build_url(config.site_id, config.key, config.signature)
+    end
+
+    def build_url(site_id, apikey, signature)
+      query = URI.encode_www_form(apikey: apikey, sig: signature)
+      URI::HTTP.build(host: config.host, path: "/v2/json-rpc/#{site_id}", query: query.to_s).to_s
+    end
+  end
+end

data/lib/masheri/service.rb

@@ -0,0 +1,22 @@
+module Masheri
+  class Service
+    include QueryInstanceMethods
+    extend QueryClassMethods
+
+    attr_accessor :service_key, :name, :limits, :created, :updated, :object_type
+
+    def self.object_type
+      "services"
+    end
+
+    def developer_activity(options = {})
+      Masheri.rest.developer_activity(service_key, start_date: 1.day.ago, end_date: 0.days.ago)
+    end
+
+    def self.show_list
+      find_each do |entry|
+        printf "Service Name: %-50s Service Key: %s\n", entry.name.inspect, entry.service_key
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masheri
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,23 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -84,25 +68,26 @@ extra_rdoc_files:
 - README.md
 - README.textile
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- README.textile
-- Rakefile
-- VERSION
 - lib/masheri.rb
 - lib/masheri/api_object_base.rb
-- lib/masheri/client.rb
+- lib/masheri/config.rb
 - lib/masheri/exceptions.rb
 - lib/masheri/init.rb
 - lib/masheri/key.rb
+- lib/masheri/local.rb
 - lib/masheri/member.rb
 - lib/masheri/query.rb
+- lib/masheri/query_builder.rb
+- lib/masheri/query_methods.rb
 - lib/masheri/rails.rb
+- lib/masheri/rest_client.rb
+- lib/masheri/rest_client/query.rb
 - lib/masheri/role.rb
-- masheri.gemspec
-- tasks/mashery.thor
+- lib/masheri/rpc_client.rb
+- lib/masheri/service.rb
+- LICENSE.txt
+- README.md
+- README.textile
 homepage: http://github.com/farleyknight/masheri
 licenses:
 - MIT
@@ -118,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4568995836595795516
+      hash: 2969431552703139300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'activesupport', ">= 3.1.0"
-gem 'thor'
-gem 'httparty'
-gem 'json'

data/Gemfile.lock

@@ -1,31 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.13)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.5)
-    json (1.8.0)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    multi_xml (0.5.5)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 3.1.0)
-  httparty
-  json
-  thor

data/Rakefile

@@ -1,15 +0,0 @@
-begin
-  require 'jeweler'
-  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.license  = "MIT"
-  end
-rescue LoadError => error
-  puts error
-end

data/VERSION

@@ -1 +0,0 @@
-0.3.1

data/lib/masheri/client.rb

@@ -1,61 +0,0 @@
-require 'active_support'
-require 'json'
-require 'httparty'
-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
-      @secret = secret
-    end
-
-    def echo(value)
-      call_remote('test.echo', value)
-    end
-
-    def perform(params)
-      # all calls are synchronous, so id in request and response will always be 1
-      if Masheri.logger
-        Masheri.logger.debug("Calling query with params #{params.inspect} on URI #{full_url}")
-      end
-
-      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 full_url
-      "#{@uri}?apikey=#{@key}&sig=#{Digest::MD5.hexdigest(@key + @secret + Time.now.to_f.to_i.to_s)}"
-    end
-  end
-end

data/masheri.gemspec

@@ -1,67 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "masheri"
-  s.version = "0.3.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Farley Knight"]
-  s.date = "2013-09-05"
-  s.email = "farleyknight@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md",
-    "README.textile"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "lib/masheri.rb",
-    "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",
-    "masheri.gemspec",
-    "tasks/mashery.thor"
-  ]
-  s.homepage = "http://github.com/farleyknight/masheri"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Rails gem for Mashery. Clean config and includes tests."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 3.1.0"])
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 3.1.0"])
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-  end
-end
-

data/tasks/mashery.thor

@@ -1,200 +0,0 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-
-# XXX: only do this when the task has not been installed
-$: << 'lib'
-
-require 'mashery'
-
-module Mashery
-  class CLI < Thor
-    namespace :mashery
-
-    desc "echo VALUE", "Echo the provided value (tests connectivity and authentication)"
-    def echo(value)
-      run { ok(::Mashery.client.echo(value)) }
-    end
-
-  protected
-    def run(&block)
-      site_id = ENV['MASHERY_SITE_ID'] or
-        raise Exception, "Please set the MASHERY_SITE_ID environment variable."
-      key = ENV['MASHERY_API_KEY'] or
-        raise Exception, "Please set the MASHERY_API_KEY environment variable."
-      secret = ENV['MASHERY_SHARED_SECRET'] or
-        raise Exception, "Please set the MASHERY_SHARED_SECRET environment variable."
-      ::Mashery.test_mode = ENV['MASHERY_PRODUCTION_MODE'].blank?
-      ::Mashery.logger.level = Logger::DEBUG
-      ::Mashery.client = ::Mashery::Client.new(site_id, key, secret)
-      begin
-        yield
-      rescue ::Mashery::HttpException => e
-        error("HTTP error: #{e.message}")
-      rescue ::Mashery::JsonRpcException => e
-        error(e.message)
-      rescue ::Mashery::ValidationException => e
-        e.errors.each {|err| warn("#{err['field']}: #{err['message']}")}
-        error("Unable to execute method due to validation errors")
-      end
-    end
-
-    def warn(msg)
-      say_status :WARN, msg, :yellow
-    end
-
-    def ok(msg)
-      say_status :OK, msg
-    end
-
-    def error(msg)
-      say_status :ERROR, msg, :red
-    end
-
-    def debug(msg)
-      say_status :DEBUG, msg, :cyan
-    end
-  end
-
-  class MemberCLI < CLI
-    namespace 'mashery:member'
-
-    desc "create USERNAME DISPLAY_NAME EMAIL [--fields ...]", "Create a member"
-    method_option :fields, :type => :hash
-    def create(username, display_name, email)
-      run do
-        begin
-          member = ::Mashery::Member.create(username, display_name, email, options[:fields])
-          ok("Member #{member.username} created")
-        rescue ::Mashery::DuplicateObjectException
-          error("The username #{username} has already been claimed")
-        end
-      end
-    end
-
-    desc "fetch USERNAME", "Fetch a member"
-    def fetch(username)
-      run do
-        member = ::Mashery::Member.fetch(username)
-        if member
-          ok("Member #{username} found")
-          say(member.to_yaml)
-        else
-          warn("Member #{username} not found")
-        end
-      end
-    end
-
-    desc "addrole USERNAME ROLE_ID", "Assign a role to a member"
-    def addrole(username, role_id)
-      run do
-        member = ::Mashery::Member.fetch(username)
-        if member
-          role = ::Mashery::Role.fetch(role_id.to_i)
-          if role
-            member.add_role(role)
-            ok("Role #{role.name} assigned to member #{username}")
-          else
-            warn("Role #{role_id} not found")
-          end
-        else
-          warn("Member #{username} not found")
-        end
-      end
-    end
-
-    desc "rmrole USERNAME ROLE_ID", "Revoke a role from a member"
-    def rmrole(username, role_id)
-      run do
-        member = ::Mashery::Member.fetch(username)
-        if member
-          role = ::Mashery::Role.fetch(role_id.to_i)
-          if role
-            member.remove_role(role)
-            ok("Role #{role.name} revoked from member #{username}")
-          else
-            warn("Role #{role_id} not found")
-          end
-        else
-          warn("Member #{username} not found")
-        end
-      end
-    end
-
-    desc "delete USERNAME", "Delete a member"
-    def delete(username)
-      run do
-        ::Mashery::Member.delete(username)
-        ok("Member #{username} deleted")
-      end
-    end
-  end
-
-  class KeyCLI < CLI
-    namespace 'mashery:key'
-
-    desc "create SERVICE_KEY USERNAME [--fields ...]", "Create a key"
-    method_option :fields, :type => :hash
-    def create(service_key, username)
-      run do
-        key = ::Mashery::Key.create(service_key, username, options[:fields])
-        ok("Key #{key.id} created for member #{username} and service #{service_key}")
-      end
-    end
-
-    desc "fetch ID", "Fetch a key"
-    def fetch(id)
-      run do
-        key = ::Mashery::Key.fetch(id.to_i)
-        if key
-          ok("Key #{id} found")
-          say(key.to_yaml)
-        else
-          warn("Key #{id} not found")
-        end
-      end
-    end
-
-    desc "delete ID", "Delete a key"
-    def delete(id)
-      run do
-        ::Mashery::Key.delete(id.to_i)
-        ok("Key #{id} deleted")
-      end
-    end
-  end
-
-  class RoleCLI < CLI
-    namespace 'mashery:role'
-
-    desc "create NAME [--fields ...]", "Create a role"
-    method_option :fields, :type => :hash
-    def create(name)
-      run do
-        role = ::Mashery::Role.create(name, options[:fields])
-        ok("Role #{role.id} created with name #{name}")
-      end
-    end
-
-    desc "fetch ID", "Fetch a role"
-    def fetch(id)
-      run do
-        role = ::Mashery::Role.fetch(id.to_i)
-        if role
-          ok("Role #{id} found")
-          say(role.to_yaml)
-        else
-          warn("Role #{id} not found")
-        end
-      end
-    end
-
-    desc "delete ID", "Delete a role"
-    def delete(id)
-      run do
-        ::Mashery::Role.delete(id.to_i)
-        ok("Role #{id} deleted")
-      end
-    end
-  end
-end