oshpark 0.0.7 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5f25d87af7fa429c3ac0963ccc7f02ece62a68
-  data.tar.gz: f514b160f998dbe1c329bbf43d1aa1ca93ce2ff3
+  metadata.gz: 9c03c63de755a320ca2ff92012a6ee518224a36d
+  data.tar.gz: fb4a13cb27455eca130da96a42e00af4c8410741
 SHA512:
-  metadata.gz: d465cfa91e925af53618e94d84694ac03e4de28b9899e5563cbc76651b37b2bb6b8d160468bb87ebaebb111250e4b878465c2c0a67933ffac6175f33036598fc
-  data.tar.gz: fb3ac304346a04ff83ae49d325932146315df8d5ef2a36c854b1a112d90bec1d040e4185523fb4f00b7a0a7913522370e612cf942873a4b2b58ba41d23671366
+  metadata.gz: 6a82622645351c80fbb0728cafcbba2c1d887d3dd122cead3223a6b2bd98e9bc63bdc3a69938d671bd5aeae0d5e88cf78c8dd163019fb42ba99cfa9256fd3026
+  data.tar.gz: bb2392fedfcf1ea183e65c057536ea50ecfbab3a1f91586d3ae8825ab017398b523ee2f4c48812aa1f82bf0c37fb99e3a33ca67381a3206c5ee650c9595ea1be

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.a
 mkmf.log
 .ruby-version
+.env

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    oshpark (0.0.7)
+    oshpark (0.0.10)
       micro_token
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
+    addressable (2.3.6)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
@@ -16,18 +16,13 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     columnize (0.8.9)
-    cucumber (1.3.15)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
+    dotenv (1.0.2)
     ffi (1.9.3)
     formatador (0.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
     guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -37,9 +32,6 @@ GEM
     guard-bundler (2.0.0)
       bundler (~> 1.0)
       guard (~> 2.2)
-    guard-cucumber (1.4.1)
-      cucumber (>= 1.2.0)
-      guard (>= 1.1.0)
     guard-rspec (4.2.9)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
@@ -50,8 +42,6 @@ GEM
     lumberjack (1.0.6)
     method_source (0.8.2)
     micro_token (0.0.3)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -75,9 +65,14 @@ GEM
     rspec-mocks (3.0.1)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.0)
+    safe_yaml (1.0.3)
     slop (3.5.0)
     thor (0.19.1)
     timers (1.1.0)
+    vcr (2.9.3)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -85,9 +80,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   byebug
-  cucumber
+  dotenv
   guard-bundler
-  guard-cucumber
   guard-rspec
   oshpark!
   pry
@@ -95,3 +89,5 @@ DEPENDENCIES
   rspec-core
   rspec-its
   rspec-mocks
+  vcr
+  webmock

data/Guardfile

@@ -4,13 +4,6 @@ guard :rspec do
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
-
-guard 'cucumber' do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
-end
-
 guard :bundler do
   watch('Gemfile')
   watch(/^.+\.gemspec/)

data/lib/oshpark.rb

@@ -3,6 +3,7 @@ require "oshpark/ext"
 require "oshpark/client"
 require "oshpark/connection"
 require "oshpark/model"
+require "oshpark/remote_model"
 require "oshpark/stateful"
 require "oshpark/dimensionable"
 require "oshpark/order_option"
@@ -17,6 +18,7 @@ require "oshpark/upload"
 require "oshpark/token"
 require "oshpark/address"
 require "oshpark/shipping_rate"
+require "oshpark/price"
 require "oshpark/order_item"
 require "oshpark/order_item_option_selection"
 

data/lib/oshpark/address.rb

@@ -10,7 +10,10 @@ module Oshpark
     attrs.each {|a| attr_accessor a }
 
     def initialize args={}
-      super check_args args
+      clean_json args do |json|
+        check_args json
+        reload_with json
+      end
     end
 
     def to_h
@@ -21,6 +24,10 @@ module Oshpark
       end
     end
 
+    def available_shipping_rates
+      ShippingRate.rates_for_address self
+    end
+
     private
 
     def check_args args

data/lib/oshpark/client.rb

@@ -38,6 +38,12 @@ module Oshpark
       end
     end
 
+    # Abandon a previous authentication.
+    def abandon
+      self.token = nil
+      refresh_token
+    end
+
     # Retrieve a list of projects for the current user.
     def projects
       get_request 'projects'
@@ -77,6 +83,16 @@ module Oshpark
       true
     end
 
+    # Request a price estimate
+    #
+    # @param width  In thousands of an Inch
+    # @param height In thousands of an Inch
+    # @param layers
+    # @param quantity Optional Defaults to the minimum quantity
+    def pricing width, height, pcb_layers, quantity = nil
+      post_request "pricing", {width_in_mils: width, height_in_mils: height, pcb_layers: pcb_layers, quantity: quantity}
+    end
+
     # List all the current user's orders, and their status.
     def orders
       get_request 'orders'
@@ -100,7 +116,7 @@ module Oshpark
     # @param project_id
     # @param quantity
     def add_order_item id, project_id, quantity
-      put_request "orders/#{id}/add_item", {project_id: project_id, quantity: quantity}
+      post_request "orders/#{id}/add_item", {order: {project_id: project_id, quantity: quantity}}
     end
 
     # Set the delivery address for an Order
@@ -108,7 +124,7 @@ module Oshpark
     # @param id
     # @param address
     def set_order_address id, address
-      put_request "orders/#{id}/set_address", address
+      post_request "orders/#{id}/set_address", {order: {address: address.to_h}}
     end
 
     def shipping_rates address_params
@@ -121,14 +137,14 @@ module Oshpark
     # @param carrier_name
     # @param service_name
     def set_order_shipping_rate id, carrier_name, service_name
-      put_request "orders/#{id}/set_shipping_rate", {carrier_name: carrier_name, service_name: service_name}
+      post_request "orders/#{id}/set_shipping_rate", {order:{shipping_rate:{carrier_name: carrier_name, service_name: service_name}}}
     end
 
     # Checkout a specific order by ID.
     #
     # @param id
     def checkout_order id
-      put_request "orders/#{id}/checkout"
+      post_request "orders/#{id}/checkout"
     end
 
     # Cancel a specific order by ID.

data/lib/oshpark/connection.rb

@@ -39,7 +39,11 @@ module Oshpark
 
       response = http.request(request)
 
-      json = JSON.parse(response.body)
+      json = if response.body.size >= 2
+               JSON.parse(response.body)
+             else
+               {}
+             end
 
       case response.code.to_i
       when 401
@@ -53,7 +57,7 @@ module Oshpark
       json
 
     rescue JSON::ParserError => e
-      raise ServerError,  "Bad response from server"
+      raise ServerError,  "Bad response from server: #{e.message}"
     end
 
     private

data/lib/oshpark/import.rb

@@ -7,6 +7,7 @@ module Oshpark
     STATES = %w| WAITING RUNNING SUCCESS ERROR FAILED |
 
     include Model
+    include RemoteModel
     include Stateful
 
     def self.create url

data/lib/oshpark/model.rb

@@ -11,25 +11,6 @@ module Oshpark
       @dirty_attributes.size > 0
     end
 
-    def save!
-      attrs = {}
-      @dirty_attributes.map do |attr|
-        attrs[attr] = public_send(attr)
-      end
-
-      Oshpark::client.public_send("update_#{object_name}", id, attrs)
-    end
-
-    def reload!
-      json = Oshpark::client.public_send(object_name, id)[object_name]
-      reload_with json
-    end
-
-    def destroy!
-      Oshpark::client.public_send("destroy_#{object_name}", id)[object_name]
-      nil
-    end
-
     def self.included base
       base.send :extend, ClassMethods
 
@@ -55,16 +36,6 @@ module Oshpark
         []
       end
 
-      def all
-        Oshpark::client.public_send(object_names)[object_names].map do |json|
-          self.from_json json
-        end
-      end
-
-      def find id
-        self.from_json(Oshpark::client.public_send(object_name, id)[object_name])
-      end
-
       def object_name
         self.name.split('::').last.downcase
       end
@@ -72,7 +43,6 @@ module Oshpark
       def object_names
         "#{object_name}s"
       end
-
     end
 
     private
@@ -91,12 +61,22 @@ module Oshpark
       self.class.object_names
     end
 
+    def clean_json json
+      json = json[object_name] if json.has_key?(object_name) && (Hash === json[object_name])
+
+      yield json if block_given?
+      json
+    end
+
     def reload_with json
-      guard_against_invalid_arguments json.keys
-      json.each do |key,value|
-        instance_variable_set "@#{key}", value
+      clean_json(json) do |json|
+        guard_against_invalid_arguments json.keys
+
+        json.each do |key,value|
+          instance_variable_set "@#{key}", value
+        end
+        @dirty_attributes = []
       end
-      @dirty_attributes = []
     end
 
     def guard_against_invalid_arguments keys
@@ -105,6 +85,5 @@ module Oshpark
       end
     end
 
-
   end
 end

data/lib/oshpark/order.rb

@@ -12,6 +12,7 @@ module Oshpark
     end
 
     include Model
+    include RemoteModel
     include Stateful
 
     def self.create
@@ -20,22 +21,28 @@ module Oshpark
 
     def add_item order_item, quantity
       json = Oshpark::client.add_order_item id, order_item.id, quantity
-      reload_with json['order']
+      reload_with json
     end
 
     def set_address address
       json = Oshpark::client.set_order_address id, address
-      reload_with json['order']
+      reload_with json
     end
 
-    def set_shipping_rate carrier_name, service_name
+    def set_shipping_rate *args
+      carrier_name, service_name = if Oshpark::ShippingRate === args.first
+                                     rate = args.first
+                                     [rate.carrier_name, rate.service_name]
+                                   else
+                                     args
+                                   end
       json = Oshpark::client.set_order_shipping_rate id, carrier_name, service_name
-      reload_with json['order']
+      reload_with json
     end
 
     def checkout
       json = Oshpark::client.checkout_order id
-      reload_with json['order']
+      reload_with json
     end
 
     def panel

data/lib/oshpark/panel.rb

@@ -9,6 +9,7 @@ module Oshpark
     end
 
     include Model
+    include RemoteModel
     include Stateful
 
     def scheduled_order_time

data/lib/oshpark/price.rb

@@ -0,0 +1,15 @@
+module Oshpark
+  class Price
+
+    def self.attrs
+      %w| width_in_mils height_in_mils pcb_layers quantity quantity_multiple minimum_quantity minimum_square_inches batches batch_cost subtotal |
+    end
+
+    include Model
+
+    def self.price_for width, height, pcb_layers, quantity = nil
+      json = Oshpark::client.pricing width, height, pcb_layers, quantity
+      from_json json['pricing']
+    end
+  end
+end

data/lib/oshpark/project.rb

@@ -11,6 +11,7 @@ module Oshpark
     end
 
     include Model
+    include RemoteModel
     include Stateful
     include Dimensionable
 
@@ -46,7 +47,7 @@ module Oshpark
 
     def approve!
       json = Oshpark::client.approve_project id
-      reload_with(json['project'])
+      reload_with json
     end
 
   end

data/lib/oshpark/remote_model.rb

@@ -0,0 +1,41 @@
+require 'time'
+
+module Oshpark
+  module RemoteModel
+
+    def self.included base
+      base.extend ClassMethods
+    end
+
+    def save!
+      attrs = {}
+      @dirty_attributes.map do |attr|
+        attrs[attr] = public_send(attr)
+      end
+
+      Oshpark::client.public_send("update_#{object_name}", id, attrs)
+    end
+
+    def reload!
+      json = Oshpark::client.public_send(object_name, id)
+      reload_with json
+    end
+
+    def destroy!
+      Oshpark::client.public_send("destroy_#{object_name}", id)
+      nil
+    end
+
+    module ClassMethods
+      def all
+        Oshpark::client.public_send(object_names)[object_names].map do |json|
+          self.from_json json
+        end
+      end
+
+      def find id
+        self.from_json(Oshpark::client.public_send(object_name, id)[object_name])
+      end
+    end
+  end
+end