machineshop 0.0.3 → 0.0.4

data/lib/machineshop/version.rb

@@ -1,3 +1,3 @@
 module MachineShop
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/machineshop.rb

@@ -50,185 +50,186 @@ module MachineShop
   class << self
     # @@api_base_url = 'http://api.machineshop.io/api/v0'
     @@api_base_url = 'http://stage.services.machineshop.io/api/v0'
+    # @@api_base_url = 'https://services.machineshop.io/api/v0'
 
-#configs starts
-attr_writer :configuration
+    #configs starts
+    attr_writer :configuration
 
-def configuration
-  @configuration ||= Configuration.new
-end
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-def configure
-  yield(configuration)
-end
+    def configure
+      yield(configuration)
+    end
 
-#reset the config object
-def reset
-  Configuration.new
-end
+    #reset the config object
+    def reset
+      Configuration.new
+    end
 
-#configs ends
+    #configs ends
 
-def api_base_url=(api_base_url)
-  @@api_base_url = api_base_url
-end
+    def api_base_url=(api_base_url)
+      @@api_base_url = api_base_url
+    end
 
-def api_base_url
-  @@api_base_url
-end
+    def api_base_url
+      @@api_base_url
+    end
 
-def get(url, auth_token, body_hash=nil)
-  platform_request(url, auth_token, body_hash)
-end
+    def get(url, auth_token, body_hash=nil)
+      platform_request(url, auth_token, body_hash)
+    end
 
-def post(url, auth_token, body_hash)
-  platform_request(url, auth_token, body_hash, :post)
-end
+    def post(url, auth_token, body_hash)
+      platform_request(url, auth_token, body_hash, :post)
+    end
 
-def delete(url, auth_token, body_hash)
-  platform_request(url, auth_token, body_hash, :delete)
-end
+    def delete(url, auth_token, body_hash)
+      platform_request(url, auth_token, body_hash, :delete)
+    end
 
-def put(url, auth_token, body_hash)
-  platform_request(url, auth_token, body_hash, :put)
-end
+    def put(url, auth_token, body_hash)
+      platform_request(url, auth_token, body_hash, :put)
+    end
 
-def headers(auth_token)
-  header ={:content_type => :json,
-    :accept => :json}
-    header.merge!({ authorization: "Basic " + Base64.encode64(auth_token + ':X') }) if auth_token
-    header
-  end
+    def headers(auth_token)
+      header ={:content_type => :json,
+      :accept => :json}
+      header.merge!({ authorization: "Basic " + Base64.encode64(auth_token + ':X') }) if auth_token
+      header
+    end
 
-  def platform_request(url, auth_token, body_hash=nil, http_verb=:get )
-    puts "body_hash: #{body_hash}"
-    opts = nil
-    api_uri = api_base_url + url
-    headers = self.headers(auth_token)
-    if http_verb == :get
-      if (body_hash && !body_hash.empty?)
-        uri = Addressable::URI.new
-        uri.query_values = body_hash
-        api_uri += "?" + uri.query
-      end
+    def platform_request(url, auth_token, body_hash=nil, http_verb=:get )
+      puts "body_hash: #{body_hash}"
+      opts = nil
+      api_uri = api_base_url + url
+      headers = self.headers(auth_token)
+      if http_verb == :get
+        if (body_hash && !body_hash.empty?)
+          uri = Addressable::URI.new
+          uri.query_values = body_hash
+          api_uri += "?" + uri.query
+        end
+
+        opts = {
+          :method => :get,
+          :url => api_uri,
+          :headers => headers,
+          :open_timeout => 30,
+          :timeout => 80
+        }
 
-      opts = {
-        :method => :get,
-        :url => api_uri,
-        :headers => headers,
-        :open_timeout => 30,
-        :timeout => 80
-      }
-
-    else
-      opts = {
-        :method => http_verb,
-        :url => api_uri,
-        :headers => headers,
-        :open_timeout => 30,
-        :payload => MachineShop::JSON.dump(body_hash),
-        :timeout => 80
-      }
-
-    end
-
-    puts "request params: #{opts} "
-
-    begin
-      response = execute_request(opts)
-    rescue SocketError => e
-      self.handle_restclient_error(e)
-    rescue NoMethodError => e
-      # Work around RestClient bug
-      if e.message =~ /\WRequestFailed\W/
-        e = APIConnectionError.new('Unexpected HTTP response code')
-        self.handle_restclient_error(e)
       else
-        raise
+        opts = {
+          :method => http_verb,
+          :url => api_uri,
+          :headers => headers,
+          :open_timeout => 30,
+          :payload => MachineShop::JSON.dump(body_hash),
+          :timeout => 80
+        }
+
       end
-    rescue RestClient::ExceptionWithResponse => e
-      if rcode = e.http_code and rbody = e.http_body
-        self.handle_api_error(rcode, rbody)
-      else
+
+      puts "request params: #{opts} "
+
+      begin
+        response = execute_request(opts)
+      rescue SocketError => e
+        self.handle_restclient_error(e)
+      rescue NoMethodError => e
+        # Work around RestClient bug
+        if e.message =~ /\WRequestFailed\W/
+          e = APIConnectionError.new('Unexpected HTTP response code')
+          self.handle_restclient_error(e)
+        else
+          raise
+        end
+      rescue RestClient::ExceptionWithResponse => e
+        if rcode = e.http_code and rbody = e.http_body
+          self.handle_api_error(rcode, rbody)
+        else
+          self.handle_restclient_error(e)
+        end
+      rescue RestClient::Exception, Errno::ECONNREFUSED => e
         self.handle_restclient_error(e)
       end
-    rescue RestClient::Exception, Errno::ECONNREFUSED => e
-      self.handle_restclient_error(e)
-    end
 
-    rbody = response.body
-    rcode = response.code
+      rbody = response.body
+      rcode = response.code
+
+      begin
+        # Would use :symbolize_names => true, but apparently there is
+        # some library out there that makes symbolize_names not work.
+        resp = MachineShop::JSON.load(rbody)
+        resp ||= {}
+        resp = Util.symbolize_names(resp)
 
-    begin
-              # Would use :symbolize_names => true, but apparently there is
-              # some library out there that makes symbolize_names not work.
-              resp = MachineShop::JSON.load(rbody)
-              resp ||= {}
-              resp = Util.symbolize_names(resp)
+        resp.merge!({:http_code => rcode}) if resp.is_a?(Hash)
+        return resp
+      rescue MultiJson::DecodeError
+        raise APIError.new("Invalid response object from API: #{rbody.inspect} (HTTP response code was #{rcode})", rcode, rbody)
+      end
 
-              resp.merge!({:http_code => rcode}) if resp.is_a?(Hash)
-              return resp
-            rescue MultiJson::DecodeError
-              raise APIError.new("Invalid response object from API: #{rbody.inspect} (HTTP response code was #{rcode})", rcode, rbody)
-            end
+    end
 
-          end
 
+    def execute_request(opts)
+      RestClient::Request.execute(opts)
+    end
 
-          def execute_request(opts)
-            RestClient::Request.execute(opts)
-          end
+    def handle_api_error(rcode, rbody)
+      begin
+        error_obj = MachineShop::JSON.load(rbody)
+        error_obj = Util.symbolize_names(error_obj)
+        error = error_obj[:error] or raise MachineShopError.new # escape from parsing
+      rescue MultiJson::DecodeError, MachineShopError
+        raise APIError.new("Invalid response object from API: #{rbody.inspect} (HTTP response code was #{rcode})", rcode, rbody)
+      end
 
-          def handle_api_error(rcode, rbody)
-            begin
-              error_obj = MachineShop::JSON.load(rbody)
-              error_obj = Util.symbolize_names(error_obj)
-      error = error_obj[:error] or raise MachineShopError.new # escape from parsing
-    rescue MultiJson::DecodeError, MachineShopError
-      raise APIError.new("Invalid response object from API: #{rbody.inspect} (HTTP response code was #{rcode})", rcode, rbody)
+      case rcode
+      when 400, 404 then
+        raise invalid_request_error(error, rcode, rbody, error_obj)
+      when 401
+        raise authentication_error(error, rcode, rbody, error_obj)
+      when 402
+        # TODO Come up with errors
+      else
+        raise api_error(error, rcode, rbody, error_obj)
+      end
     end
 
-    case rcode
-    when 400, 404 then
-      raise invalid_request_error(error, rcode, rbody, error_obj)
-    when 401
-      raise authentication_error(error, rcode, rbody, error_obj)
-    when 402
-      # TODO Come up with errors
-    else
-      raise api_error(error, rcode, rbody, error_obj)
+    def invalid_request_error(error, rcode, rbody, error_obj)
+      InvalidRequestError.new(error, error, rcode, rbody, error_obj)
     end
-  end
 
-  def invalid_request_error(error, rcode, rbody, error_obj)
-    InvalidRequestError.new(error, error, rcode, rbody, error_obj)
-  end
+    def authentication_error(error, rcode, rbody, error_obj)
+      AuthenticationError.new(error, rcode, rbody, error_obj)
+    end
 
-  def authentication_error(error, rcode, rbody, error_obj)
-    AuthenticationError.new(error, rcode, rbody, error_obj)
-  end
+    def api_error(error, rcode, rbody, error_obj)
+      APIError.new(error, rcode, rbody, error_obj)
+    end
 
-  def api_error(error, rcode, rbody, error_obj)
-    APIError.new(error, rcode, rbody, error_obj)
-  end
+    def handle_restclient_error(e)
+      case e
+      when RestClient::ServerBrokeConnection, RestClient::RequestTimeout
+        message = "Could not connect to MachineShop (#{@@api_base_url}).  Please check your internet connection and try again.  If this problem persists, you should check MachineShop's service status."
+      when RestClient::SSLCertificateNotVerified
+        message = "Could not verify MachineShops's SSL certificate.  Please make sure that your network is not intercepting certificates."
+      when SocketError
+        message = "Unexpected error communicating when trying to connect to MachineShop (#{@@api_base_url}).  HINT: You may be seeing this message because your DNS is not working."
+      else
+        message = "Unexpected error communicating with MachineShop"
+      end
+      message += "\n\n(Network error: #{e.message})"
+      # puts "error message string : #{message}"
+      raise APIConnectionError.new(message)
+    end
 
-  def handle_restclient_error(e)
-    case e
-    when RestClient::ServerBrokeConnection, RestClient::RequestTimeout
-      message = "Could not connect to MachineShop (#{@@api_base_url}).  Please check your internet connection and try again.  If this problem persists, you should check MachineShop's service status."
-    when RestClient::SSLCertificateNotVerified
-      message = "Could not verify MachineShops's SSL certificate.  Please make sure that your network is not intercepting certificates."
-    when SocketError
-      message = "Unexpected error communicating when trying to connect to MachineShop (#{@@api_base_url}).  HINT: You may be seeing this message because your DNS is not working."
-    else
-      message = "Unexpected error communicating with MachineShop"
-    end
-    message += "\n\n(Network error: #{e.message})"
-    # puts "error message string : #{message}"
-    raise APIConnectionError.new(message)
-  end
 
-  
-  
-end
+
+  end
 end

data/spec/lib/api_calls_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
-#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'publisher@csr.com'
 publisher_password = 'password'
 

data/spec/lib/customer_spec.rb

@@ -1,9 +1,6 @@
 require_relative '../spec_helper'
 
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'

data/spec/lib/device_instances.rb

@@ -1,9 +1,5 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
-#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 

data/spec/lib/device_spec.rb

@@ -1,8 +1,5 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'

data/spec/lib/mapping_spec.rb

@@ -1,10 +1,7 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
 #publisher_username = 'publisher@machineshop.com'
-publisher_username = 'publisher@csr.com'
+publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 
 
@@ -16,6 +13,7 @@ publisher_password = 'password'
 describe MachineShop::Mapping do
 
    it "should get a geocoded address" do
+    ap "geocoding address"
     element_data = MachineShop::Mapping.geocode(
         {
             :address => "1600 Amphitheatre Parkway, Mountain View, CA",
@@ -23,6 +21,7 @@ describe MachineShop::Mapping do
         },
         auth_token)
 
+ap element_data.as_json
     #puts "GEO: #{element_data}"
 
     element_data.should_not be_nil
@@ -30,6 +29,7 @@ describe MachineShop::Mapping do
   end
 
   it "should get directions" do
+    ap "getting directions"
     element_data = MachineShop::Mapping.directions(
         {
             :origin => "Denver",
@@ -37,7 +37,7 @@ describe MachineShop::Mapping do
             :sensor => "false"
         },
         auth_token)
-
+# ap element_data.as_json
     #puts "GEO: #{element_data}"
 
     element_data.should_not be_nil
@@ -45,6 +45,7 @@ describe MachineShop::Mapping do
   end
 
   it "should get distance" do
+    ap "getting distance "
     element_data = MachineShop::Mapping.distance(
         {
             :origins => "Vancouver BC",
@@ -54,7 +55,7 @@ describe MachineShop::Mapping do
             :sensor => "false"
         },
         auth_token)
-
+ap element_data.as_json
     #puts "GEO: #{element_data}"
 
     element_data.should_not be_nil

data/spec/lib/meter_spec.rb

@@ -1,10 +1,7 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
 #publisher_username = 'publisher@machineshop.com'
-publisher_username = 'publisher@csr.com'
+publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 
 
@@ -19,7 +16,7 @@ describe MachineShop::Meter do
   it "should get all meter data" do
     element_data = MachineShop::Meter.all({}, auth_token)
 
-    # puts "element_data from all: #{element_data}"
+    puts "element_data from all: #{element_data}"
 
     element_data.should_not be_nil
     element_data.should_not be_empty
@@ -28,17 +25,20 @@ describe MachineShop::Meter do
   it "should get meter by id " do
 
     meter_id = element_data[0].id
+ap "retrieving meter for id #{meter_id}"
 
     # element_data = MachineShop::Meter.retrieve(meter_id, auth_token)
-    element_data = MachineShop::Meter.retrieve("53847ac2b99e9c0a30000001", auth_token)
+    element_data = MachineShop::Meter.retrieve(meter_id, auth_token)
     puts "meter by id : #{element_data}"
     element_data.should_not be_nil
   end
 
   it "should get meters via a user" do
+
+    ap "meters by user "
     element_data = user.meters
 
-    # puts "meters via user: #{element_data}"
+    puts "meters via user: #{element_data}"
     element_data.should_not be_nil
     element_data.should_not be_empty
   end

data/spec/lib/report_spec.rb

@@ -1,7 +1,5 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
 
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'publisher@csr.com'
@@ -19,7 +17,9 @@ describe MachineShop::Report do
     it "should get all report data" do
     element_data = MachineShop::Report.all({}, auth_token)
 reports=element_data
-    # puts "element_data: #{element_data}"
+
+puts "yaaaaaaaaaaaaaaaaaaaaa"
+    puts "element_data: #{element_data}"
 
     element_data.should_not be_nil
     element_data.should_not be_empty

data/spec/lib/rule_spec.rb

@@ -1,9 +1,5 @@
 require_relative '../spec_helper'
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
-#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 

data/spec/lib/user_spec.rb

@@ -1,10 +1,6 @@
 require_relative '../spec_helper'
 
 
-#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
-MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
-
-#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 require 'machineshop'
 require "awesome_print"
+require 'active_support'
 require "active_support/core_ext"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machineshop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - machineshop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +110,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Readme_old.bkmMd
 - doc.txt
 - lib/machineshop.rb
 - lib/machineshop/api_operations/create.rb
@@ -133,7 +134,6 @@ files:
 - lib/machineshop/machineshop_object.rb
 - lib/machineshop/mapping.rb
 - lib/machineshop/meter.rb
-- lib/machineshop/models/people.rb
 - lib/machineshop/report.rb
 - lib/machineshop/rule.rb
 - lib/machineshop/user.rb

data/lib/machineshop/models/people.rb

@@ -1,11 +0,0 @@
-module MachineShop
-# require 'active_record'
-
-# require 'machineshop/database'
-
-# Database.new
-
-class People
-# end
-
-end