carabiner 0.0.2.pre.alpha1 → 0.0.2.pre.alpha2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ1NTdlZmFiNWU5ZDc2OWM2YWIwNzlhNjMwMGZiYzZiYjA2OGY4Ng==
+    MWQ1MTE4MzgxYWRjZjgzMjAyMzFjNWY4NGQ3Nzk1ZDE2YjI4MGZlYQ==
   data.tar.gz: !binary |-
-    NzBkZjEwNDJhNTEyYjM3OTUxOTc5MTcxYmZkMDg2NTE2MzM4MTRjNQ==
+    MzNjZmNhODRkZTc2NmExMTlhMjU0ZDZlYzFiZDVmN2Q3MDhlNDI1ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTc0OGIwYmZiNjA3MzA2ZjRkZGQ4ZWJhMTkxMDRhMGE4NmYyMjU2ZGI0ODMz
-    MWQ1NGI5YWJlZDU2Nzc4NThkM2Y2NWEwMDg0ODMxYzM0N2FlZTQ3YzY2ZjM1
-    MjUyOWJmNmE1ZTliMWY0ZWJiNzJkMzVmY2JmYzYyMWEyYWNkOGU=
+    ZTViMDU1MGRjMDZjNjYyNzg3YzMxOTYyZjZmODkzNzA3ZWViOTQ1ZjIwNThh
+    YzhhZjhmMGNhZjg3ODYyNDdmZjAyNDIyNDE2YWJlNWY1NTg3YjIyMjhmY2Vi
+    ZGIzZTQ3NmJlYWI3MzI4MmU4ZDU2MzY0MzU4NzZkY2E3NjVjZDQ=
   data.tar.gz: !binary |-
-    NGM4YTE2NzViMzVkNTQyZGFiYzFlNjMwYWRkYTI1YTg0MjA2NzRkYThlZGQ5
-    Yjc5Yzk1MjFhNGFkNmI1MjExMjhmMmYyNDMyOWIxZTA5ZGNjNWUzZGE3Njkz
-    YzY3YjI1OTA5ZTc4OTViMWZmNDMxYjJiYzcwOGQ4OTFmMjIwNTA=
+    ZWY3YjI3MmYyNDhiMzQ1YTJiNGFiYTQ2Yjc1Mzg1NTk3NGE1ODEwZWJmMmFi
+    OWMwZWM2N2QwYjdiZDM1MzgyMGU4YTY3ZTRiNTNiNzFlMWQxMDk0Y2ZhNDJl
+    ODFmOTNjZWNiMzE2ZDA1ZTAxNjFhZWFjMGMwOWIwNTBlOGEzYmQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carabiner (0.0.1)
+    carabiner (0.0.2.pre.alpha2)
       bubble-wrap
       motion-require (~> 0.0.3)
       rake

data/README.md

@@ -1,4 +1,4 @@
-# Carabiner [![Build Status](https://travis-ci.org/mordaroso/carabiner.png)](https://travis-ci.org/mordaroso/carabiner)
+# Carabiner [![Build Status](https://travis-ci.org/mordaroso/carabiner.png)](https://travis-ci.org/mordaroso/carabiner) [![Gem Version](https://badge.fury.io/rb/carabiner.png)](http://badge.fury.io/rb/carabiner)
 
 Rubymotion wrapper for the easy access to the keychain.
 
@@ -6,8 +6,82 @@ Rubymotion wrapper for the easy access to the keychain.
 
 **This gem is still under heavy development and will be released soon. Please be paitent.**
 
+## Installation
+
+Install the gem
+```bash
+gem install carabiner
+```
+
+And add it to your Rakefile
+```ruby
+require 'carabiner'
+```
+
+Or use [Bundler](http://gembundler.com/) to manage your gem dependencies
+```ruby
+gem 'carabiner'
+```
+
+## Usage
+
+First add the Security framwork and the entitlement setting to your Rakefile.
+
+```ruby
+app.frameworks += ['Security']
+
+app.entitlements['keychain-access-groups'] = [
+  app.seed_id + '.' + app.identifier
+]
+```
+
+Initialize a keychain item with an unique identifier as a finder hash. If it already exists the keychain data will be available otherwise it will set it up.
+
+```ruby
+@item = Carabiner::PasswordItem.new generic: 'YourKeyChainItemIdentifier'
+```
+
+After the initialization you have access to all kSecClassGenericPassword attributes with getter and setter methods.
+*Note: These values are not secure.*
+```ruby
+@item.access_group      # The corresponding value is of type CFStringRef and indicates which access group an item is in.
+@item.creation_time     # The corresponding value is of type CFDateRef and represents the date the item was created. Read only.
+@item.modifaction_date  # The corresponding value is of type CFDateRef and represents the last time the item was updated. Read only.
+@item.description       # The corresponding value is of type CFStringRef and specifies a user-visible string describing this kind of item (for example, "Disk image password").
+@item.comment           # The corresponding value is of type CFStringRef and contains the user-editable comment for this item.
+@item.creator           # The corresponding value is of type CFNumberRef and represents the item's creator. This number is the unsigned integer representation of a four-character code (for example, 'aCrt').
+@item.type              # The corresponding value is of type CFNumberRef and represents the item's type. This number is the unsigned integer representation of a four-character code (for example, 'aTyp').
+@item.label             # The corresponding value is of type CFStringRef and contains the user-visible label for this item.
+@item.is_invisible      # The corresponding value is of type CFBooleanRef and is kCFBooleanTrue if the item is invisible (that is, should not be displayed).
+@item.is_negative       # The corresponding value is of type CFBooleanRef and indicates whether there is a valid password associated with this keychain item. This is useful if your application doesn't want a password for some particular service to be stored in the keychain, but prefers that it always be entered by the user.
+@item.account           # The corresponding value is of type CFStringRef and contains an account name. Items of class kSecClassGenericPassword and kSecClassInternetPassword have this attribute.
+@item.service           # The corresponding value is a string of type CFStringRef that represents the service associated with this item. Items of class kSecClassGenericPassword have this attribute.
+@item.generic           # The corresponding value is of type CFDataRef and contains a user-defined attribute. Items of class kSecClassGenericPassword have this attribute.
+```
+
+Set and get the secure password
+```ruby
+@item.password = 'secure'
+@item.password
+```
+
+And then save the item to the keychain.
+```ruby
+@item.save!
+```
+
+To delete the data use ```@item.delete!``` or ```@item.reset!```.
+
+## Documentation
+
+See Apples [Keychain Services Reference](https://developer.apple.com/library/mac/documentation/Security/Reference/keychainservices/Reference/reference.html) for more information
+
 ## TODOs
 
-* Better error handling
-* Code Documentation
-* README
+* Better Documentation
+* OSX Support
+* Secure Notes
+* Certificates
+* Keys
+
+Feel free to fork and submit pull requests!

data/app/app_delegate.rb

@@ -4,7 +4,7 @@ class AppDelegate
     @window.rootViewController = SettingsController.alloc.init
     @window.rootViewController.wantsFullScreenLayout = true
     @window.makeKeyAndVisible
-    return true
+    true
   end
 
   def user

data/app/models/user.rb

@@ -2,7 +2,7 @@ class User
   attr_accessor :username, :password
 
   def initialize
-    @keychain = Carabiner::PasswordKeychainItem.new 'ExampleAppLoginData'
+    @keychain = Carabiner::PasswordItem.new :generic => 'ExampleAppLoginData'
     load
   end
 

data/lib/carabiner/base_item.rb

@@ -0,0 +1,160 @@
+module Carabiner
+  class BaseItem
+    attr_accessor :query, :persistent, :identifiers
+
+    def self.attributes(attrs = nil)
+      if attrs
+        @attributes = attrs
+        attr_accessor *attrs.keys
+      else
+        @attributes ||= {}
+      end
+    end
+
+    def self.sec_class sec_class = nil
+      @sec_class ||= sec_class
+    end
+
+    NoErr = 0
+
+    def initialize identifiers
+      @identifiers = identifiers
+      reset_to_identifiers
+
+      self.query = data
+      query[KSecClass] = self.class.sec_class
+
+      if BubbleWrap::Device.simulator?
+        query.delete(KSecAttrAccessGroup)
+      end
+
+      query[KSecMatchLimit] = KSecMatchLimitOne
+      query[KSecReturnAttributes] = KCFBooleanTrue
+
+      tempQuery = NSDictionary.dictionaryWithDictionary query
+      outDictionaryPtr = Pointer.new(:object)
+      if !(SecItemCopyMatching(tempQuery, outDictionaryPtr) == NoErr)
+        reset!
+        self.data = self.data.merge identifiers
+        self.persistent = false
+
+        unless Device.simulator?
+          query[KSecAttrAccessGroup] = identifiers[:access_group]
+        end
+      else
+        self.persistent = true
+        self.data = secItemFormatToDictionary(outDictionaryPtr[0])
+      end
+    end
+
+    def save!
+      writeToKeychain
+      self.persistent = true
+      true
+    end
+
+    def delete!
+      if persistent?
+        tempDictionary = dictionaryToSecItemFormat(data)
+        result = SecItemDelete(tempDictionary)
+        if result != NoErr && result != ErrSecItemNotFound
+          raise KeychainReturnCodeException.new "Problem deleting current dictionary.", result
+        end
+        self.persistent = false
+      end
+      self.data = {}
+      true
+    end
+
+    def reset!
+      delete! unless data.empty?
+      reset_to_identifiers
+      true
+    end
+
+    def self.key_accepted? key
+      attributes.values.include? key
+    end
+
+    def persistent?
+      persistent
+    end
+
+    def data
+      self.class.attributes.keys.inject({}) do |memo, getter_name|
+        constant = self.class.attributes[getter_name]
+        value    = send(getter_name)
+        memo[constant] = value if value
+        memo
+      end
+    end
+
+    def data=(hash)
+      self.class.attributes.each do |getter_name, constant|
+        send("#{getter_name}=", hash[constant])
+      end
+    end
+
+    private
+
+    def reset_to_identifiers
+      identifiers.each do |getter_name, value|
+        send("#{getter_name}=", value)
+      end
+    end
+
+    def dictionaryToSecItemFormat dictionaryToConvert
+      returnDictionary = NSMutableDictionary.dictionaryWithDictionary dictionaryToConvert
+      returnDictionary[KSecClass] = self.class.sec_class
+      passwordString = dictionaryToConvert[KSecValueData]
+
+      returnDictionary[KSecValueData] = passwordString.dataUsingEncoding(NSUTF8StringEncoding)
+      returnDictionary
+    end
+
+    def secItemFormatToDictionary dictionaryToConvert
+      returnDictionary = NSMutableDictionary.dictionaryWithDictionary dictionaryToConvert
+      returnDictionary[KSecReturnData] = KCFBooleanTrue
+      returnDictionary[KSecClass] = self.class.sec_class
+
+      passwordDataPtr = Pointer.new(:object)
+
+      result = SecItemCopyMatching(returnDictionary, passwordDataPtr)
+      if result == NoErr
+        returnDictionary.delete KSecReturnData
+        passwordData = passwordDataPtr[0]
+        password = NSString.alloc.initWithBytes(passwordData.bytes, length: passwordData.length, encoding: NSUTF8StringEncoding)
+        returnDictionary[KSecValueData] = password
+      else
+        raise KeychainReturnCodeException.new "Serious error, no matching item found in the keychain.", result
+      end
+
+      returnDictionary
+    end
+
+    def writeToKeychain
+      attributesPtr = Pointer.new(:object)
+      if SecItemCopyMatching(query, attributesPtr) == NoErr
+        query = NSMutableDictionary.dictionaryWithDictionary attributesPtr[0]
+
+        query[KSecClass] = self.class.sec_class
+        attributes_to_update = dictionaryToSecItemFormat data
+        attributes_to_update.delete_if { |key, value| !self.class.key_accepted? key }
+
+        if Device.simulator?
+          attributes_to_update.delete KSecAttrAccessGroup
+        end
+
+        result = SecItemUpdate(query, attributes_to_update)
+        unless result == NoErr
+          raise KeychainReturnCodeException.new "Couldn't update the Keychain Item.", result
+        end
+      else
+        result = SecItemAdd(dictionaryToSecItemFormat(data), nil)
+        unless result == NoErr
+          raise KeychainReturnCodeException.new "Couldn't add the Keychain Item.", result
+        end
+      end
+    end
+  end
+end

data/lib/carabiner/internet_password_item.rb

@@ -0,0 +1,152 @@
+module Carabiner
+  class InternetPasswordItem < BaseItem
+    # These are the default constants and their respective types,
+    # available for the KSecClassInternetPassword Keychain Item class:
+    #
+    # See the header file Security/SecItem.h for more details.
+    attributes({
+                 # The corresponding value is of type CFStringRef and indicates which access group an item is in. Access groups can be used to share keychain items among two or more applications. For applications to share a keychain item, the applications must have a common access group listed in their keychain-access-groups entitlement, and the application adding the shared item to the keychain must specify this shared access-group name as the value for this key in the dictionary passed to the SecItemAdd function.
+                 # An application can be a member of any number of access groups. By default, the SecItemUpdate, SecItemDelete, and SecItemCopyMatching functions search all the access groups an application is a member of. Include this key in the search dictionary for these functions to specify which access group is searched.
+                 # A keychain item can be in only a single access group.
+                 access_group: KSecAttrAccessGroup,
+
+                 # The corresponding value is of type CFDateRef and represents the date the item was created. Read only.
+                 creation_time: KSecAttrCreationDate,
+
+                 # The corresponding value is of type CFDateRef and represents the last time the item was updated. Read only.
+                 modifaction_date: KSecAttrModificationDate,
+
+                 # The corresponding value is of type CFStringRef and specifies a user-visible string describing this kind of item (for example, "Disk image password").
+                 description: KSecAttrDescription,
+
+                 # The corresponding value is of type CFStringRef and contains the user-editable comment for this item.
+                 comment: KSecAttrComment,
+
+                 # The corresponding value is of type CFNumberRef and represents the item's creator. This number is the unsigned integer representation of a four-character code (for example, 'aCrt').
+                 creator: KSecAttrCreator,
+
+                 # The corresponding value is of type CFStringRef and contains the user-visible label for this item.
+                 type: KSecAttrType,
+
+                 # The corresponding value is of type CFStringRef and contains the user-visible label for this item.
+                 label: KSecAttrLabel,
+
+                 # The corresponding value is of type CFBooleanRef and is kCFBooleanTrue if the item is invisible (that is, should not be displayed).
+                 is_invisible: KSecAttrIsInvisible,
+
+                 # The corresponding value is of type CFBooleanRef and indicates whether there is a valid password associated with this keychain item. This is useful if your application doesn't want a password for some particular service to be stored in the keychain, but prefers that it always be entered by the user.
+                 is_negative: KSecAttrIsNegative,
+
+                 # The corresponding value is of type CFStringRef and contains an account name. Items of class kSecClassGenericPassword and kSecClassInternetPassword have this attribute.
+                 account: KSecAttrAccount,
+
+                 # The corresponding value is of type CFStringRef and represents the Internet security domain. Items of class kSecClassInternetPassword have this attribute.
+                 security_domain: KSecAttrSecurityDomain,
+
+                 # The corresponding value is of type CFStringRef and contains the server's domain name or IP address. Items of class kSecClassInternetPassword have this attribute.
+                 server: KSecAttrServer,
+
+                 # The corresponding value is of type CFNumberRef and denotes the protocol for this item (see “Protocol Values”). Items of class kSecClassInternetPassword have this attribute.
+                 protocol: KSecAttrProtocol,
+
+                 # The corresponding value is of type CFNumberRef and denotes the authentication scheme for this item (see “Authentication Type Values”).
+                 authentication_type: KSecAttrAuthenticationType,
+
+                 # The corresponding value is of type CFNumberRef and represents an Internet port number. Items of class kSecClassInternetPassword have this attribute.
+                 port: KSecAttrPort,
+
+                 # The corresponding value is of type CFStringRef and represents a path, typically the path component of the URL. Items of class kSecClassInternetPassword have this attribute.
+                 path: KSecAttrPath,
+
+                 # Data attribute key. A persistent reference to a credential can be stored on disk for later use or passed to other processes.
+                 # The corresponding value is of type CFDataRef.  For keys and password items, the data is secret (encrypted) and may require the user to enter a password for access.
+                 password: KSecValueData
+               })
+
+    sec_class KSecClassInternetPassword
+
+    def self.authentication_type_values
+      {
+        ntlm: KSecAttrAuthenticationTypeNTLM,
+        msn: KSecAttrAuthenticationTypeMSN,
+        dpa: KSecAttrAuthenticationTypeDPA,
+        rpa: KSecAttrAuthenticationTypeRPA,
+        http_basic: KSecAttrAuthenticationTypeHTTPBasic,
+        http_digest: KSecAttrAuthenticationTypeHTTPDigest,
+        html_form: KSecAttrAuthenticationTypeHTMLForm,
+        default: KSecAttrAuthenticationTypeDefault
+      }
+    end
+
+    def self.protocol_values
+      {
+        ftp: KSecAttrProtocolFTP,
+        ftp_account: KSecAttrProtocolFTPAccount,
+        http: KSecAttrProtocolHTTP,
+        irc: KSecAttrProtocolIRC,
+        nntp: KSecAttrProtocolNNTP,
+        pop3: KSecAttrProtocolPOP3,
+        smtp: KSecAttrProtocolSMTP,
+        socks: KSecAttrProtocolSOCKS,
+        imap: KSecAttrProtocolIMAP,
+        ldap: KSecAttrProtocolLDAP,
+        apple_talk: KSecAttrProtocolAppleTalk,
+        afp: KSecAttrProtocolAFP,
+        telnet: KSecAttrProtocolTelnet,
+        ssh: KSecAttrProtocolSSH,
+        ftps: KSecAttrProtocolFTPS,
+        https: KSecAttrProtocolHTTPS,
+        http_proxy: KSecAttrProtocolHTTPProxy,
+        https_proxy: KSecAttrProtocolHTTPSProxy,
+        ftp_proxy: KSecAttrProtocolFTPProxy,
+        smb: KSecAttrProtocolSMB,
+        rtsp: KSecAttrProtocolRTSP,
+        rtsp_proxy: KSecAttrProtocolRTSPProxy,
+        daap: KSecAttrProtocolDAAP,
+        eppc: KSecAttrProtocolEPPC,
+        ipp: KSecAttrProtocolIPP,
+        nntps: KSecAttrProtocolNNTPS,
+        ldaps: KSecAttrProtocolLDAPS,
+        telnet_s: KSecAttrProtocolTelnetS,
+        imaps: KSecAttrProtocolIMAPS,
+        ircs: KSecAttrProtocolIRCS,
+        pop3_s: KSecAttrProtocolPOP3S
+      }
+    end
+
+    def protocol_sym
+      self.class.protocol_values.find {|k, v| v == @protocol }.first if @protocol
+    end
+
+    def protocol=(value)
+      if self.class.protocol_values.values.include? value
+        @protocol = value
+      else
+        new_protocol = self.class.protocol_values.find {|k, v| k == value }
+        @protocol = new_protocol.last if new_protocol
+      end
+    end
+
+    def authentication_type_sym
+      self.class.authentication_type_values.find {|k, v| v == @authentication_type }.first if @authentication_type
+    end
+
+    def authentication_type=(value)
+      if self.class.authentication_type_values.values.include? value
+        @authentication_type = value
+      else
+        new_authentication_type = self.class.authentication_type_values.find {|k, v| k == value }
+        @authentication_type = new_authentication_type.last if new_authentication_type
+      end
+    end
+
+    def reset!
+      super
+      self.account     = ''
+      self.label       = ''
+      self.description = ''
+      self.password    = ''
+      true
+    end
+  end
+end

data/lib/carabiner/password_item.rb

@@ -0,0 +1,67 @@
+module Carabiner
+  class PasswordItem < BaseItem
+
+    # These are the default constants and their respective types,
+    # available for the kSecClassGenericPassword Keychain Item class:
+    #
+    # See the header file Security/SecItem.h for more details.
+    attributes({
+                 # The corresponding value is of type CFStringRef and indicates which access group an item is in. Access groups can be used to share keychain items among two or more applications. For applications to share a keychain item, the applications must have a common access group listed in their keychain-access-groups entitlement, and the application adding the shared item to the keychain must specify this shared access-group name as the value for this key in the dictionary passed to the SecItemAdd function.
+                 # An application can be a member of any number of access groups. By default, the SecItemUpdate, SecItemDelete, and SecItemCopyMatching functions search all the access groups an application is a member of. Include this key in the search dictionary for these functions to specify which access group is searched.
+                 # A keychain item can be in only a single access group.
+                 access_group: KSecAttrAccessGroup,
+
+                 # The corresponding value is of type CFDateRef and represents the date the item was created. Read only.
+                 creation_time: KSecAttrCreationDate,
+
+                 # The corresponding value is of type CFDateRef and represents the last time the item was updated. Read only.
+                 modifaction_date: KSecAttrModificationDate,
+
+                 # The corresponding value is of type CFStringRef and specifies a user-visible string describing this kind of item (for example, "Disk image password").
+                 description: KSecAttrDescription,
+
+                 # The corresponding value is of type CFStringRef and contains the user-editable comment for this item.
+                 comment: KSecAttrComment,
+
+                 # The corresponding value is of type CFNumberRef and represents the item's creator. This number is the unsigned integer representation of a four-character code (for example, 'aCrt').
+                 creator: KSecAttrCreator,
+
+                 # The corresponding value is of type CFNumberRef and represents the item's type. This number is the unsigned integer representation of a four-character code (for example, 'aTyp').
+                 type: KSecAttrType,
+
+                 # The corresponding value is of type CFStringRef and contains the user-visible label for this item.
+                 label: KSecAttrLabel,
+
+                 # The corresponding value is of type CFBooleanRef and is kCFBooleanTrue if the item is invisible (that is, should not be displayed).
+                 is_invisible: KSecAttrIsInvisible,
+
+                 # The corresponding value is of type CFBooleanRef and indicates whether there is a valid password associated with this keychain item. This is useful if your application doesn't want a password for some particular service to be stored in the keychain, but prefers that it always be entered by the user.
+                 is_negative: KSecAttrIsNegative,
+
+                 # The corresponding value is of type CFStringRef and contains an account name. Items of class kSecClassGenericPassword and kSecClassInternetPassword have this attribute.
+                 account: KSecAttrAccount,
+
+                 # The corresponding value is a string of type CFStringRef that represents the service associated with this item. Items of class kSecClassGenericPassword have this attribute.
+                 service: KSecAttrService,
+
+                 # The corresponding value is of type CFDataRef and contains a user-defined attribute. Items of class kSecClassGenericPassword have this attribute.
+                 generic: KSecAttrGeneric,
+
+                 # Data attribute key. A persistent reference to a credential can be stored on disk for later use or passed to other processes.
+                 # The corresponding value is of type CFDataRef.  For keys and password items, the data is secret (encrypted) and may require the user to enter a password for access.
+                 password: KSecValueData
+               })
+
+    sec_class KSecClassGenericPassword
+
+    def reset!
+      super
+      self.account     = ''
+      self.label       = ''
+      self.description = ''
+      self.password    = ''
+      true
+    end
+
+  end
+end

data/lib/carabiner/version.rb

@@ -1,3 +1,3 @@
 module Carabiner
-  VERSION = "0.0.2-alpha1"
+  VERSION = "0.0.2.pre.alpha2"
 end

data/spec/models/internet_password_item_spec.rb

@@ -0,0 +1,38 @@
+module Carabiner
+  describe InternetPasswordItem do
+    before do
+      @item = InternetPasswordItem.new :server => 'github.com', :protocol => :https
+      @item.password = 'secret'
+      @item.account  = 'Test'
+      @item.authentication_type = :html_form
+      @item.save!
+    end
+
+    after do
+      @item.delete!
+    end
+
+    it 'initialize attributes' do
+      new_item = InternetPasswordItem.new :server => 'github.com', :protocol => :https
+      new_item.account.should == 'Test'
+      new_item.password.should == 'secret'
+      new_item.server.should   == 'github.com'
+      new_item.protocol_sym.should == :https
+      new_item.authentication_type_sym.should == :html_form
+      new_item.persistent?.should == true
+    end
+
+    it 'reset!' do
+      @item.reset!
+      @item.account.should == ''
+      @item.password.should == ''
+    end
+
+    it 'delete!' do
+      @item.delete!
+      @item.account.should == nil
+      @item.password.should == nil
+      @item.persistent?.should == false
+    end
+  end
+end

data/spec/models/{password_keychain_item_spec.rb → password_item_spec.rb}

@@ -1,14 +1,18 @@
 module Carabiner
-  describe PasswordKeychainItem do
+  describe PasswordItem do
     before do
-      @item = PasswordKeychainItem.new 'TestPasswordItem'
+      @item = PasswordItem.new :generic => 'TestPasswordItem'
       @item.password = 'secret'
       @item.account  = 'Test'
       @item.save!
     end
 
+    after do
+      @item.delete!
+    end
+
     it 'initialize attributes' do
-      new_item = PasswordKeychainItem.new 'TestPasswordItem'
+      new_item = PasswordItem.new :generic => 'TestPasswordItem'
       new_item.account.should == 'Test'
       new_item.password.should == 'secret'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carabiner
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre.alpha1
+  version: 0.0.2.pre.alpha2
 platform: ruby
 authors:
 - mordaroso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,15 +100,18 @@ files:
 - app/views/settings_view.rb
 - carabiner.gemspec
 - lib/carabiner.rb
+- lib/carabiner/base_item.rb
+- lib/carabiner/internet_password_item.rb
 - lib/carabiner/keychain_return_code_exception.rb
-- lib/carabiner/password_keychain_item.rb
+- lib/carabiner/password_item.rb
 - lib/carabiner/version.rb
 - scripts/travis/add-key.sh
 - scripts/travis/profile/4A8AC2EE-F24B-4F4E-A6F0-67F9BC46B924.mobileprovision
 - scripts/travis/remove-key.sh
 - spec/main_spec.rb
+- spec/models/internet_password_item_spec.rb
 - spec/models/keychain_return_code_exception_spec.rb
-- spec/models/password_keychain_item_spec.rb
+- spec/models/password_item_spec.rb
 - spec/models/user_spec.rb
 homepage: http://rubygems.org/gems/carabiner
 licenses: []
@@ -135,7 +138,8 @@ specification_version: 4
 summary: Rubymotion wrapper for the keychain
 test_files:
 - spec/main_spec.rb
+- spec/models/internet_password_item_spec.rb
 - spec/models/keychain_return_code_exception_spec.rb
-- spec/models/password_keychain_item_spec.rb
+- spec/models/password_item_spec.rb
 - spec/models/user_spec.rb
 has_rdoc: 

data/lib/carabiner/password_keychain_item.rb

@@ -1,160 +0,0 @@
-module Carabiner
-  class PasswordKeychainItem
-
-    attr_accessor :generic_password_query
-
-    # These are the default constants and their respective types,
-    # available for the kSecClassGenericPassword Keychain Item class:
-    #
-    # See the header file Security/SecItem.h for more details.
-    ATTRIBUTES = {
-      :access_group => KSecAttrAccessGroup,
-      :creation_time => KSecAttrCreationDate,
-      :modifaction_date => KSecAttrModificationDate,
-      :description => KSecAttrDescription,
-      :comment => KSecAttrComment,
-      :creator => KSecAttrCreator,
-      :type => KSecAttrType,
-      :label => KSecAttrLabel,
-      :is_invisible => KSecAttrIsInvisible,
-      :is_negative => KSecAttrIsNegative,
-      :account => KSecAttrAccount,
-      :service => KSecAttrService,
-      :generic => KSecAttrGeneric,
-      :password => KSecValueData
-    }
-
-    ATTRIBUTES.keys.each do |key|
-      attr_accessor key
-    end
-
-    NoErr = 0
-
-    def initialize identifier, accessGroup = nil
-      self.generic_password_query = {}
-      generic_password_query[KSecClass] = KSecClassGenericPassword
-      generic_password_query[KSecAttrGeneric] = identifier
-
-      if !accessGroup.nil? && !Device.simulator?
-        generic_password_query[KSecAttrAccessGroup] = accessGroup
-      end
-
-      generic_password_query[KSecMatchLimit] = KSecMatchLimitOne
-      generic_password_query[KSecReturnAttributes] = KCFBooleanTrue
-
-      tempQuery = NSDictionary.dictionaryWithDictionary generic_password_query
-      outDictionaryPtr = Pointer.new(:object)
-
-      if !(SecItemCopyMatching(tempQuery, outDictionaryPtr) == NoErr)
-        reset!
-        self.generic = identifier
-
-        if !accessGroup.nil? && !Device.simulator?
-          generic_password_query[KSecAttrAccessGroup] = accessGroup
-        end
-      else
-        self.keychain_item_data = secItemFormatToDictionary(outDictionaryPtr[0])
-      end
-    end
-
-    def reset!
-      delete! unless keychain_item_data.empty?
-      self.account     = ''
-      self.label       = ''
-      self.description = ''
-      self.password    = ''
-      true
-    end
-
-    def save!
-      writeToKeychain
-      true
-    end
-
-    def delete!
-      tempDictionary = dictionaryToSecItemFormat(keychain_item_data)
-      result = SecItemDelete(tempDictionary)
-      if result != NoErr && result != ErrSecItemNotFound
-        raise KeychainReturnCodeException.new "Problem deleting current dictionary.", result
-      end
-      self.keychain_item_data = {}
-      true
-    end
-
-    def self.key_accepted? key
-      ATTRIBUTES.values.include? key
-    end
-
-    private
-
-    def keychain_item_data
-      ATTRIBUTES.keys.inject({}) do |memo, getter_name|
-        constant = ATTRIBUTES[getter_name]
-        value    = send(getter_name)
-        memo[constant] = value if value
-        memo
-      end
-    end
-
-    def keychain_item_data=(hash)
-      ATTRIBUTES.each do |getter_name, constant|
-        send("#{getter_name}=", hash[constant])
-      end
-    end
-
-    def dictionaryToSecItemFormat dictionaryToConvert
-      returnDictionary = NSMutableDictionary.dictionaryWithDictionary dictionaryToConvert
-      returnDictionary[KSecClass] = KSecClassGenericPassword
-      passwordString = dictionaryToConvert[KSecValueData]
-
-      returnDictionary[KSecValueData] = passwordString.dataUsingEncoding(NSUTF8StringEncoding)
-      returnDictionary
-    end
-
-    def secItemFormatToDictionary dictionaryToConvert
-      returnDictionary = NSMutableDictionary.dictionaryWithDictionary dictionaryToConvert
-      returnDictionary[KSecReturnData] = KCFBooleanTrue
-      returnDictionary[KSecClass] = KSecClassGenericPassword
-
-      passwordDataPtr = Pointer.new(:object)
-
-      result = SecItemCopyMatching(returnDictionary, passwordDataPtr)
-      if result == NoErr
-        returnDictionary.delete KSecReturnData
-        passwordData = passwordDataPtr[0]
-        password = NSString.alloc.initWithBytes(passwordData.bytes, length: passwordData.length, encoding: NSUTF8StringEncoding)
-        returnDictionary[KSecValueData] = password
-      else
-        raise KeychainReturnCodeException.new "Serious error, no matching item found in the keychain.", result
-      end
-
-      returnDictionary
-    end
-
-    def writeToKeychain
-      attributesPtr = Pointer.new(:object)
-      if SecItemCopyMatching(generic_password_query, attributesPtr) == NoErr
-        query = NSMutableDictionary.dictionaryWithDictionary attributesPtr[0]
-
-        query[KSecClass] = generic_password_query[KSecClass]
-        attributes_to_update = dictionaryToSecItemFormat keychain_item_data
-        attributes_to_update.delete_if { |key, value| !self.class.key_accepted? key }
-
-        if Device.simulator?
-          attributes_to_update.delete KSecAttrAccessGroup
-        end
-
-        result = SecItemUpdate(query, attributes_to_update)
-        unless result == NoErr
-          raise KeychainReturnCodeException.new "Couldn't update the Keychain Item.", result
-        end
-      else
-        result = SecItemAdd(dictionaryToSecItemFormat(keychain_item_data), nil)
-        unless result == NoErr
-          raise KeychainReturnCodeException.new "Couldn't add the Keychain Item.", result
-        end
-      end
-    end
-
-  end
-end