zuckermo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7ba3d8cf28f49471f9c5f694831ef277fc5d0b
-  data.tar.gz: eca59206eb095baa14b94ce5874b49d2118be9fb
+  metadata.gz: 15862040247ad3843f1b6a5c89daf9be6770d2c7
+  data.tar.gz: 5f63569a8bcabed9b8c1ac3e775d7dcc6784f0ba
 SHA512:
-  metadata.gz: 1cb5fb0cdaddf116baa247ac24edcf550a1c1ee39645ca05d369f639333851dba0945981aa37bf50215ac549508db9505626b5800b719a672297905041d9d8e7
-  data.tar.gz: 148c0bdd9145db908b3e2f4c01d6e12377d6365cfac8166f2e20d65eaf54614485d8b2e52de3232ef8cbfcae56de1a7f0564e975b07d5409e8980f6781a46d60
+  metadata.gz: f282997f04544da3b75fc8f3a280ad7fe8963c15a1df8efe4a59372d35913a988d9f2a68343bde955911359eb25e081e88e39620c28e5b1297141393c4581cf1
+  data.tar.gz: cb7f7e4bca9ea98c2141dc958d99f314ce1aef123bafb1eb7b53840f605bbe6625ba1a6b5b2914b1cf9f3655dad9683968602ef008e72e38cd0243c38f4573f8

data/Rakefile

@@ -13,4 +13,5 @@ Motion::Project::App.setup do |app|
   app.name = 'Zuckermo'
   app.identifier = 'com.zuckermo.test'
   app.info_plist['APP_ID'] = ENV['APP_ID']
+  app.deployment_target = "5.1"
 end

data/lib/zuckermo.rb

@@ -8,10 +8,12 @@ require 'bubble-wrap'
 
 Motion::Project::App.setup do |app|
 
-  Dir.glob(File.join(File.dirname(__FILE__), '../motion/**/*.rb')).each do |file|
+  root = File.join( File.dirname(__FILE__), '../motion' )
+  zuckermo_files = Dir.glob root+'/**/*.rb'
+
+  %W[#{root}/pollute.rb #{root}/facebook.rb #{root}/zuckermo.rb] + zuckermo_files.each do |file|
     app.files.unshift(file)
   end
-  app.frameworks += ["Facebook", "Accounts"]
-  app.deployment_target = "5.1"
+  app.weak_frameworks += ["Social","Accounts"]
 
 end

data/lib/zuckermo/version.rb

@@ -1,3 +1,3 @@
 module Zuckermo
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/motion/pollute.rb

@@ -6,4 +6,4 @@ end
 class ACAccount
   alias_method :account_description, :accountDescription
   alias_method :account_type, :accountType
-end
+end

data/motion/zuckermo/account_store.rb

@@ -10,56 +10,52 @@ module Zuckermo
     attr_accessor :app_id
     attr_reader :account_store
 
-    if defined?(ACAccountTypeIdentifierFacebook) #Check's for iOS6
+    def facebook_supported?
+      UIDevice.currentDevice.systemVersion.to_f >= 6
+    end
 
-      def account_type
+    def account_type
+      if facebook_supported?
         self.account_store.accountTypeWithAccountTypeIdentifier(ACAccountTypeIdentifierFacebook)
+      else
+        nil
       end
+    end
 
-      def accounts
-        (self.account_store.accountsWithAccountType(account_type) || []).collect do |ac_account|
-          Zuckermo::User.new ac_account
-        end
+    def accounts
+      (self.account_store.accountsWithAccountType(account_type) || []).collect do |ac_account|
+        Zuckermo::User.new ac_account
       end
+    end
 
-      def sign_in permissions, audience, &block
-        @permissions, @audience, @callback = permissions, audience, block
-
-        if accounts.size > 0
-
-          @options =
-            {
-              ACFacebookAppIdKey       => @app_id,
-              ACFacebookPermissionsKey => @permissions
-            }
-
-          self.account_store.requestAccessToAccountsWithType( self.account_type,
-              options: @options,
-              completion: -> granted, error do
-                Dispatch::Queue.main.sync do
-                  @callback.call(granted, error)
-                end
+    def sign_in permissions, audience, &block
+      @permissions, @audience, @callback = permissions, audience, block
+
+      if facebook_supported?
+        @options =
+          {
+            ACFacebookAppIdKey       => @app_id,
+            ACFacebookPermissionsKey => @permissions
+          }
+
+        self.account_store.requestAccessToAccountsWithType( self.account_type,
+            options: @options,
+            completion: -> granted, error do
+              Dispatch::Queue.main.sync do
+                @callback.call(granted, error)
               end
-          )
-        else
-          @callback.call false, NSError.alloc.initWithDomain( 'com.zuckermo.no_accounts', code: 0, userInfo: nil )
-        end
-      end
-
-    else # We currently don't support iOS5
-
-      def account_type
-        raise NotImplemented
+            end
+        )
+      else
+        @callback.call false, unsupported_error
       end
+    end
 
-      def accounts
-        []
-      end
+    private
 
-      def sign_in permissions, audience, &block
-        block.call false, NotImplemented
+      def unsupported_error
+        NSError.errorWithDomain('com.zuckermo.unsupported_ios_version', code: 0, userInfo:nil)
       end
-    end
 
   end
 end

data/spec/main_spec.rb

@@ -8,10 +8,10 @@ describe "Accessing a Facebook account" do
   it 'allows us to retrieve the users name' do
     if Facebook.accounts.size > 0
       wait 1 do
-        tap 'ok'
+        tap 'OK'
       end
       wait 1
-      view('username').text.should.equal ENV['USER']
+      view('username').text.should.equal ENV['FBUSER']
     else
       warn "\n\n!!!!!!!!!!!!!\n\n No acounts on simulator"
       view('username').text.should.equal 'Fail... See Log'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuckermo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jon Rowe
@@ -29,7 +29,7 @@ cert_chain:
   2feWfO4gCNmvfFjULOAYHq9JHEjN5SLSXvj5HdSnDcCyIfJKn5Ya3JahWQaWIsXf
   /NPE/mB57TOwj+d7XUa2NC4HUadF8R51IYEcIB0PpIEzJlKtfXFcOZxO
   -----END CERTIFICATE-----
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap