localeapp 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.3.2
+
+* Use yml rather than json when making api calls to localeapp.com. This avoids
+  symbols turning into strings and breaking parts of rails.
+
 # Version 0.3.1
 
 * Handle SocketError so we don't cause errors in client apps when they're not

data/features/step_definitions/cli_steps.rb

@@ -16,14 +16,14 @@ When /^I have a valid project on localeapp\.com but an incorrect api key "([^"]*
 end
 
 When /^I have a translations on localeapp\.com for the project with api key "([^"]*)"$/ do |api_key|
-  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations.json"
-  body = valid_translation_data.to_json
+  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations.yml"
+  body = valid_translation_data.to_yaml
   add_fake_web_uri(:get, uri, ['200', 'OK'], body)
 end
 
 When /^new translations for the api key "([^"]*)" since "([^"]*)" with time "([^"]*)"$/ do |api_key, update_time, new_time|
-  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations.json?updated_at=#{update_time}"
-  body = valid_translation_data.to_json
+  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations.yml?updated_at=#{update_time}"
+  body = valid_translation_data.to_yaml
   add_fake_web_uri(:get, uri, ['200', 'OK'], body, 'date' => Time.at(new_time.to_i).httpdate)
 end
 

data/lib/localeapp/cli/pull.rb

@@ -21,7 +21,7 @@ module Localeapp
       def update_backend(response)
         @output.puts "Success!"
         @output.puts "Updating backend:"
-        Localeapp.updater.update(JSON.parse(response))
+        Localeapp.updater.update(YAML.load(response))
         @output.puts "Success!"
         Localeapp.poller.write_synchronization_data!(Time.now.to_i, Time.now.to_i)
       end

data/lib/localeapp/poller.rb

@@ -50,7 +50,7 @@ module Localeapp
 
     def handle_success(response)
       @success = true
-      Localeapp.updater.update(JSON.parse(response))
+      Localeapp.updater.update(YAML.load(response))
       write_synchronization_data!(Time.now.to_i, Time.parse(response.headers[:date]).to_i)
     end
 

data/lib/localeapp/routes.rb

@@ -12,7 +12,7 @@ module Localeapp
     end
 
     def translations_url(options={})
-      options[:format] ||= 'json'
+      options[:format] ||= 'yml'
       url = http_scheme.build(base_options.merge(:path => translations_path(options[:format])))
       url.query = options[:query].map { |k,v| "#{k}=#{v}" }.join('&') if options[:query]
       url.to_s

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/localeapp/poller_spec.rb

@@ -53,22 +53,22 @@ describe Localeapp::Poller do
     
   describe "#poll!" do
     it "returns false if get returns 304 Not Modified" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.json?updated_at=#{@updated_at}", :body => '', :status => ['304', 'Not Modified'])
+      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['304', 'Not Modified'])
       @poller.poll!.should == false
     end
 
     it "returns false if get returns a 50x response" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.json?updated_at=#{@updated_at}", :body => '', :status => ['500', 'Internal Server Error'])
+      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['500', 'Internal Server Error'])
       @poller.poll!.should == false
     end
 
     it "returns false if get returns 200 OK" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.json?updated_at=#{@updated_at}", :body => @hash.to_json, :status => ['200', 'OK'], :date => Time.now.httpdate)
+      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
       @poller.poll!.should == true
     end
 
     it "passes the data through to the Updater" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.json?updated_at=#{@updated_at}", :body => @hash.to_json, :status => ['200', 'OK'], :date => Time.now.httpdate)
+      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
       Localeapp.updater.should_receive(:update).with(@hash)
       @poller.poll!
     end

data/spec/localeapp/routes_spec.rb

@@ -41,9 +41,9 @@ describe Localeapp::Routes do
   end
 
   describe "#translations_url" do
-    it "it extends the project_url and defaults to json" do
+    it "it extends the project_url and defaults to yml" do
       with_configuration(@config) do
-        @routes.translations_url.should == "https://test.host/v1/projects/API_KEY/translations.json"
+        @routes.translations_url.should == "https://test.host/v1/projects/API_KEY/translations.yml"
       end
     end
 
@@ -57,7 +57,7 @@ describe Localeapp::Routes do
 
     it "can be changed to another content type" do
       with_configuration(@config) do
-        @routes.translations_url(:format => :yml).should == 'https://test.host/v1/projects/API_KEY/translations.yml'
+        @routes.translations_url(:format => :json).should == 'https://test.host/v1/projects/API_KEY/translations.json'
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n