wordy-ruby 0.2.1 → 0.2.2

data/README.markdown

@@ -16,6 +16,7 @@ require 'wordy'
 Wordy.configure do |c|
    c.api_key   = ENV['WORDY_API_KEY']
    c.username  = ENV['WORDY_USERNAME']
+   c.env       = 'production'
 end
 
 if Wordy::Account.balance > 0
@@ -25,4 +26,6 @@ if Wordy::Account.balance > 0
   puts "Your text will be ready at: #{job.delivery_date}"
 end
 
-```
+```
+
+By default the Wordy environment is production, if you want to use the staging environment, set the 'env' attribute to 'staging'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/wordy/account.rb

@@ -2,13 +2,13 @@ module Wordy
   class Account
     class << self
       def balance
-        response = Cli.http_get(Wordy::WORDY_URL+'account/', {})
+        response = Cli.http_get(Wordy.wordy_url+'account/', {})
         return nil if response.empty?
         response['balance'].to_s.match(/[^0-9]?([0-9]+\.{0,1}[0-9]+)/)[1].to_f
       end
       
       def languages
-        Cli.http_get(Wordy::WORDY_URL+'languages/', {})
+        Cli.http_get(Wordy.wordy_url+'languages/', {})
       end
     end
   end

data/lib/wordy/job.rb

@@ -53,12 +53,12 @@ module Wordy
           parameters[:content] = content
         end
         parameters = parameters.delete_if{|key, value| value.nil? }
-        response = Cli.http_post(Wordy::WORDY_URL+'job/create/', parameters)
+        response = Cli.http_post(Wordy.wordy_url+'job/create/', parameters)
         return new(response)
       end
       
       def all
-        response = Cli.http_get(Wordy::WORDY_URL+"job/", {})
+        response = Cli.http_get(Wordy.wordy_url+"job/", {})
         response.map do |job_id|
           new({'id' => job_id})
         end
@@ -78,34 +78,34 @@ module Wordy
     end
     
     def info
-      response = Cli.http_get(Wordy::WORDY_URL+"job/#{self.id}/", {})
+      response = Cli.http_get(Wordy.wordy_url+"job/#{self.id}/", {})
       set_attributes(response)
     end
     
     def edited_document
-      response = Cli.http_get(Wordy::WORDY_URL+"job/#{self.id}/target/", {})
+      response = Cli.http_get(Wordy.wordy_url+"job/#{self.id}/target/", {})
       edited_content = response.values[0]
       set_attributes({:edited_content => edited_content})
     end
     
     def conversation
-      Cli.http_get(Wordy::WORDY_URL+"job/#{self.id}/conversation/", {})
+      Cli.http_get(Wordy.wordy_url+"job/#{self.id}/conversation/", {})
     end
     
     def update_conversation(message)
-      Cli.http_post(Wordy::WORDY_URL+"job/#{self.id}/conversation/", {'message' => message})
+      Cli.http_post(Wordy.wordy_url+"job/#{self.id}/conversation/", {'message' => message})
     end
     
     def pay!
-      Cli.http_post(Wordy::WORDY_URL+"job/#{self.id}/pay/", {})
+      Cli.http_post(Wordy.wordy_url+"job/#{self.id}/pay/", {})
     end
     
     def confirm!
-      Cli.http_post(Wordy::WORDY_URL+"job/#{self.id}/confirm/", {})
+      Cli.http_post(Wordy.wordy_url+"job/#{self.id}/confirm/", {})
     end
     
     def reject!
-      Cli.http_post(Wordy::WORDY_URL+"job/#{self.id}/reject/", {})
+      Cli.http_post(Wordy.wordy_url+"job/#{self.id}/reject/", {})
     end
   end
 end

data/lib/wordy.rb

@@ -1,16 +1,14 @@
 require "net/http"
-# require 'net/http/post/multipart'
-# require 'digest/md5'
 require 'uri'
 require 'cgi'
 require 'active_support'
-# require 'active_support/hash_with_indifferent_access'
 
 module Wordy
-  WORDY_URL = URI.parse('https://staging.wordy.com/api/1.0/')
+  WORDY_URL         = URI.parse('https://wordy.com/api/1.0/')
+  WORDY_STAGING_URL = URI.parse('https://staging.wordy.com/api/1.0/')
   
   class << self
-    attr_accessor :api_key, :username
+    attr_accessor :api_key, :username, :env
     
     # In your initializer:
     # Wordy.configure do |c|
@@ -19,8 +17,13 @@ module Wordy
     # end
     #
     def configure
+      self.env = 'production'
       yield self
     end
+    
+    def wordy_url
+      self.env == 'production' ? WORDY_URL : WORDY_STAGING_URL
+    end
   end
   
 end

data/spec/wordy/job_spec.rb

@@ -34,7 +34,7 @@ describe Wordy::Job do
   describe "Creating a new job" do
     it "should create a new job with a title" do
       Wordy::Cli.stub!(:http_post).and_return(wordy_job)
-      Wordy::Cli.should_receive(:http_post).with(Wordy::WORDY_URL+'job/create/', {
+      Wordy::Cli.should_receive(:http_post).with(Wordy.wordy_url+'job/create/', {
         :language_id => 'en',
         :intrusive_editing=>false,
         :json => '{"My title":"My great content"}'
@@ -46,7 +46,7 @@ describe Wordy::Job do
     
     it "should create a new job without a title" do
       Wordy::Cli.stub!(:http_post).and_return(wordy_job)
-      Wordy::Cli.should_receive(:http_post).with(Wordy::WORDY_URL+'job/create/', {
+      Wordy::Cli.should_receive(:http_post).with(Wordy.wordy_url+'job/create/', {
         :language_id => 'en',
         :intrusive_editing=>false,
         :content => 'My great content'

data/wordy-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wordy-ruby"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bastien Vaucher - MagmaHQ"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordy-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70143749583580 !ruby/object:Gem::Requirement
+  requirement: &70168323893840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143749583580
+  version_requirements: *70168323893840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70143749583100 !ruby/object:Gem::Requirement
+  requirement: &70168323893240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70143749583100
+  version_requirements: *70168323893240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70143749582600 !ruby/object:Gem::Requirement
+  requirement: &70168323892660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70143749582600
+  version_requirements: *70168323892660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70143749582120 !ruby/object:Gem::Requirement
+  requirement: &70168323892060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143749582120
+  version_requirements: *70168323892060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70143749581620 !ruby/object:Gem::Requirement
+  requirement: &70168323891520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70143749581620
+  version_requirements: *70168323891520
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70143749581140 !ruby/object:Gem::Requirement
+  requirement: &70168323891000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70143749581140
+  version_requirements: *70168323891000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70143749580620 !ruby/object:Gem::Requirement
+  requirement: &70168323890480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70143749580620
+  version_requirements: *70168323890480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70143749580100 !ruby/object:Gem::Requirement
+  requirement: &70168323889880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70143749580100
+  version_requirements: *70168323889880
 description: Ruby library to access the Wordy API
 email: bastien.vaucher@gmail.com
 executables: []
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 619029678829513043
+      hash: 3462829428795377299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: