RubyGems - phone_gap-build - Versions diffs - 0.2.0 → 0.3.0 - Mend

phone_gap-build 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml +4 -4
data/Rakefile +3 -1
data/lib/phone_gap/build/app.rb +15 -2
data/lib/phone_gap/build/rest_resource.rb +16 -4
data/lib/phone_gap/build/version.rb +1 -1
data/spec/fixtures/index.html +8 -0
data/spec/phone_gap/build/app_spec.rb +37 -1
data/spec/phone_gap/build/rest_resource_spec.rb +20 -3
data/spec/support/fixtures.rb +4 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899a79a1f62e5235bc0f9a1f216d3a9bbd72ca89
-  data.tar.gz: 704aaa02c1219ff6077c4fd37c7201a81ff15d7c
+  metadata.gz: b7d9c20c29ac0055691fac9fabb28e826f8f4886
+  data.tar.gz: a62b82a3c032051c18b30335440c1b6bafb3a28c
 SHA512:
-  metadata.gz: 00e0094338041ae7785c8b943eea9747e259b9922a19407d5ca5f1fd2867aae0cb4ef98608d721ac43e4d80d8dc18d5dc03b914c2679efae4c1b9571c5e3103d
-  data.tar.gz: 2060ab63c6e1b05228f38ca2323b420100a41f01a6d709e7f52e4e6f3c64131091a79d3e0fc8df20ef140812486e7343a03373e52dc8a362f83957197c01402a
+  metadata.gz: b97eac4703677d6f6840ca14902520f82e4872d9e514f9d23a419b0b1bdccc9223ae62229d246002b80abb904f024f4deb95dbecf57f9b64cb2d1b8e760b5aa4
+  data.tar.gz: 20294eb0791f250b3916e1136b6c1fdc8f21485a7d1f5ff7b6d9b7612631379c7ede10e78ccc2a1ed5d734b80012ddf23bbdbfdd3444cedfc0dce95ac8b27d86

data/Rakefile CHANGED Viewed

@@ -2,4 +2,6 @@ require "bundler/gem_tasks"
 # for RSpec
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new('spec')
+task :default => [:spec]

data/lib/phone_gap/build/app.rb CHANGED Viewed

@@ -6,10 +6,23 @@ module PhoneGap
     class App < RestResource
       PATH = '/apps'
-      attr_creatable :title, :create_method, :package, :version, :description, :debug, :keys, :private, :phonegap_version, :hydrates
-      attr_updatable :title, :package, :version, :description, :debug, :private, :phonegap_version
+      attr_accessor :title, :create_method, :package, :version, :description, :debug, :keys, :private,
+                    :phonegap_version, :hydrates, :file
+      attr_creatable :title, :create_method, :package, :version, :description, :debug, :keys, :private,
+                     :phonegap_version, :hydrates, :file
+      attr_updatable :title, :package, :version, :description, :debug, :private, :phonegap_version
+      def post_options
+        if file
+          data_attributes = creatable_attributes
+          data_attributes.delete('@file')
+          {query: {file: file, data: as_json(only: data_attributes, remove_nils: true)}, detect_mime_type: true}
+        else
+          {query: {data: as_json(only: creatable_attributes, remove_nils: true)}}
+        end
+      end
     end
   end
 end

data/lib/phone_gap/build/rest_resource.rb CHANGED Viewed

@@ -16,10 +16,11 @@ module PhoneGap
       end
       def create
-        response = self.class.post(path, query: {data: as_json(only: creatable_attributes)})
+        response = self.class.post(path, post_options)
         if response.success?
           populate_from_json(JSON.parse(response.body))
         end
+        self
       end
       def update
@@ -36,17 +37,22 @@ module PhoneGap
       def as_json(params = {})
         if params[:only]
-          params[:only].inject({}) do | memo, attribute_name|
+          json = params[:only].inject({}) do | memo, attribute_name|
             memo[attribute_name[1..-1].to_sym] = instance_variable_get(attribute_name)
             memo
           end
         else
-          {}
+          json = {}
         end
+        params[:remove_nils] ? json.delete_if {|k, v| v.nil? } : json
       end
       private
+      def post_options
+        { query: { data: as_json(only: creatable_attributes) } }
+      end
       def path
         @id ? "#{self.class.const_get('PATH')}/#{@id}?auth_token=#{token}" : "#{self.class.const_get('PATH')}?auth_token=#{token}"
       end
@@ -56,7 +62,13 @@ module PhoneGap
       end
       def populate_from_json(json)
-        self.class.new(json)
+        json.each do |key, value|
+          if respond_to?("#{key}=")
+            send("#{key}=", value)
+          else
+            instance_variable_set("@#{key}", value)
+          end
+        end
       end
     end
   end

data/lib/phone_gap/build/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module PhoneGap
   module Build
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/fixtures/index.html ADDED Viewed

@@ -0,0 +1,8 @@
+<html>
+<head>
+</head>
+<body>
+<p>Some content here</p>
+</body>
+</html>

data/spec/phone_gap/build/app_spec.rb CHANGED Viewed

@@ -11,7 +11,7 @@ describe PhoneGap::Build::App do
     subject { PhoneGap::Build::App }
     %w(title create_method package version description debug keys private phonegap_version hydrates).each do |attribute|
-      it "'#{attribute}' is updatable" do
+      it "'#{attribute}' is creatable" do
         expect(subject.class_variable_get('@@creatable_attributes')[subject]).to include "@#{attribute}"
       end
     end
@@ -27,4 +27,40 @@ describe PhoneGap::Build::App do
       end
     end
   end
+  describe '#create' do
+    let(:response) { double('response', :success? => false) }
+    context 'when there are populated and non-populated creatable variables' do
+      before do
+        subject.title = 'title'
+        subject.create_method = 'create method'
+        subject.package = nil
+      end
+      it 'sends query data for all creatable attributes that do not have a value of nil' do
+        expected_options = { query: {data: { title: 'title', create_method: 'create method'}}}
+        expect(subject.class).to receive(:post).with(anything, expected_options ).and_return response
+        subject.create
+      end
+      context 'when a file is present' do
+        let(:file) { fixture_file('index.html') }
+        before do
+          subject.file = file
+        end
+        it 'sends the file through as part of the query' do
+          expected_options =
+              { query: { file: file, data: {title: 'title', create_method: 'create method'}}, detect_mime_type: true}
+          expect(subject.class).to receive(:post).with(anything, expected_options).and_return response
+          subject.create
+        end
+      end
+    end
+  end
 end

data/spec/phone_gap/build/rest_resource_spec.rb CHANGED Viewed

@@ -16,7 +16,7 @@ describe PhoneGap::Build::RestResource do
       class Child < PhoneGap::Build::RestResource
-        attr_accessor :id
+        attr_accessor :id, :file
         PATH = 'users'
@@ -42,10 +42,27 @@ describe PhoneGap::Build::RestResource do
           subject.create
         end
+        context 'child class has #post_options' do
+          let(:post_options) { lambda{ 'wonder woman'} }
+          before do
+            subject.define_singleton_method(:post_options, post_options)
+          end
+          it 'posts using options from the child class' do
+            expect(subject.class).to receive(:post).with(anything, 'wonder woman').and_return response
+            subject.create
+          end
+        end
+        context 'child class does not have #post_options' do
           it 'sends a body containing all the json representation of the object' do
-            expect(subject.class).to receive(:post).with(anything(), query: {data: {}}).and_return response
+            expect(subject.class).to receive(:post).with(anything, query: {data: subject.as_json}).and_return response
             subject.create
           end
+        end
         context 'after successful creation' do
@@ -57,7 +74,7 @@ describe PhoneGap::Build::RestResource do
           it 'updates the object with any response attributes' do
             response = subject.create
-            expect(response).to be_kind_of Child
+            expect(response.object_id).to be subject.object_id
             expect(response.instance_variable_get('@title')).to eq 'Batman'
             expect(response.instance_variable_get('@rating')).to eq 5
           end

data/spec/support/fixtures.rb CHANGED Viewed

@@ -3,4 +3,8 @@ require 'json'
 def response_body_for(request)
   fixture_file = File.open(ROOT_DIR + "fixtures/api_responses/#{request}.json")
   File.read(fixture_file)
+end
+def fixture_file(filename)
+  File.new(ROOT_DIR + "fixtures/#{filename}")
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phone_gap-build
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Seb Glazebrook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty
@@ -102,6 +102,7 @@ files:
 - phone_gap-build.gemspec
 - spec/fixtures/api_responses/get-apps.json
 - spec/fixtures/api_responses/rest-resource-create.json
+- spec/fixtures/index.html
 - spec/phone_gap/build/app_spec.rb
 - spec/phone_gap/build/rest_resource_spec.rb
 - spec/phone_gap/build_spec.rb
@@ -134,6 +135,7 @@ summary: PhoneGap Build Api gem
 test_files:
 - spec/fixtures/api_responses/get-apps.json
 - spec/fixtures/api_responses/rest-resource-create.json
+- spec/fixtures/index.html
 - spec/phone_gap/build/app_spec.rb
 - spec/phone_gap/build/rest_resource_spec.rb
 - spec/phone_gap/build_spec.rb