everyday-menu 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65fe99d0614a2c80d84ecd7e9aa70c9fd5481e45
-  data.tar.gz: bb2e0bd5c2ed4ac778d709cc8499e847853a6f99
+  metadata.gz: fbeebf51707a98f36e409ae30e849588db3fef2a
+  data.tar.gz: 6bbb05135928f8ed25da6d141c42ddc1bb42c9b3
 SHA512:
-  metadata.gz: 6fc838c7298c9fa120c0f6f33930d1be0a91a35c93b9c5c1f7d206204ec63094f5f8ce6790acaff37f1d8960faab5118cdc902cd87ba25408042773b7519dfd1
-  data.tar.gz: ca3113c3197d23a54b6d1ce6c32df21acbe2973e2ba8e530b1f2ccb4ffd8480ac772b4bdc001afc1daf88a50711bd39cca37337eb5835484376b31c333388525
+  metadata.gz: 3b7a2426c808d2baaa7f32e2bb8fbedf2545191229f4d23c2a5827816b2b41f82f2a83be00a124b81fd3300d98bce3e8122a61a0b8780534aeb53e39a268ecad
+  data.tar.gz: 7b37c01163abfc5eeb78b025d76c1e2f1d06dd314d398b275ec450d5574701cabd5dfc9cbeb26d6e04cd0befe3317791306b862fa085a989f8497405c4a56462

data/.gitignore

@@ -16,12 +16,8 @@ test/tmp
 test/version_tmp
 tmp
 build
-vendor
-
 /.idea/
-
 /projectFilesBackup/
-
 /.repl_history
-
 /.dat3715.000
+vendor/MD5SHA1Digest/build-MacOSX

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in everyday-menu.gemspec
 gemspec
 
-gem 'rm-digest'
+# gem 'rm-digest'

data/everyday-menu.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.3'
   #spec.add_development_dependency 'simplecov', '>= 0.8.2'
   #spec.add_development_dependency 'coveralls', '>= 0.7.0'
 
-  spec.add_dependency 'rm-digest'
+  # spec.add_dependency 'rm-digest'
 end

data/lib/everyday-menu.rb

@@ -1,6 +1,3 @@
-require 'rm-digest'
-require 'rm-digest/md5'
-
 unless defined?(Motion::Project::Config)
   raise 'The everyday-menu gem must be required within a RubyMotion project Rakefile.'
 end
@@ -9,4 +6,7 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'everyday-menu/**/*.rb')).each do |file|
     app.files.unshift(file)
   end
+
+  digest_vendor = File.expand_path(File.join(File.dirname(__FILE__), '../vendor/MD5SHA1Digest'))
+  app.vendor_project(digest_vendor, :static)
 end

data/lib/everyday-menu/utils.rb

@@ -1,7 +1,3 @@
-class EverydayRmDigest
-  include RmDigest
-end
-
 module EverydayMenu
   class EverydayCommand
     attr_reader :label, :parent, :command_id
@@ -40,8 +36,12 @@ module EverydayMenu
       @rand   = Random.new
     end
 
+    def md5(str)
+      str.dataUsingEncoding(NSUTF8StringEncoding).MD5HexDigest
+    end
+
     def unique_id
-      EverydayRmDigest::MD5.hexdigest(WeakRef.new("#{@rand.rand}#{@rand.rand}"))
+      md5(WeakRef.new("#{@rand.rand}#{@rand.rand}"))
     end
 
     def rand_id
@@ -103,12 +103,12 @@ module EverydayMenu
       end
 
       def self.key_to_name(key, prefix = nil)
-        rval = WeakRef.new(WeakRef.new(key.to_s).gsub(/_(\w)/) { |_| $1.upcase })
-        prefix.nil? ? rval : WeakRef.new("#{prefix}#{rval[0].upcase}#{rval[1..-1]}")
+        rval = WeakRef.new(WeakRef.new(key.to_s).gsub(/_(\w)/) { |_| WeakRef.new(WeakRef.new($1).upcase) })
+        prefix.nil? ? rval : WeakRef.new("#{prefix}#{WeakRef.new(WeakRef.new(rval[0]).upcase)}#{WeakRef.new(rval[1..-1])}")
       end
 
       def self.name_to_key(name)
-        WeakRef.new(WeakRef.new(name.to_s).gsub(/A-Z/) { |c| c.downcase }).to_sym
+        WeakRef.new(WeakRef.new(name.to_s).gsub(/A-Z/) { |c| WeakRef.new(WeakRef.new(c).downcase) }).to_sym
       end
 
       def self.getter_names(name)

data/lib/everyday-menu/version.rb

@@ -1,3 +1,3 @@
 module EverydayMenu
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/vendor/MD5SHA1Digest/NSData+MD5Digest.h

@@ -0,0 +1,18 @@
+//
+//  NSData+MD5Digest.h
+//  MD5SHA1Digest
+//
+//  Created by Tom Meinlschmidt on 28.2.2013.
+//  Copyright (c) 2013 Tom Meinlschmidt. All rights reserved.
+//
+#import <Foundation/Foundation.h>
+
+@interface NSData (MD5Digest)
+
++(NSData *)MD5Digest:(NSData *)input;
+-(NSData *)MD5Digest;
+
++(NSString *)MD5HexDigest:(NSData *)input;
+-(NSString *)MD5HexDigest;
+
+@end

data/vendor/MD5SHA1Digest/NSData+MD5Digest.m

@@ -0,0 +1,40 @@
+//
+//  NSData+MD5Digest.m
+//  MD5SHA1Digest
+//
+//  Created by Tom Meinlschmidt on 28.2.2013.
+//  Copyright (c) 2013 Tom Meinlschmidt. All rights reserved.
+//
+
+#import "NSData+MD5Digest.h"
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation NSData (MD5)
+
++(NSData *)MD5Digest:(NSData *)input {
+    unsigned char result[CC_MD5_DIGEST_LENGTH];
+    
+    CC_MD5(input.bytes, input.length, result);
+    return [[NSData alloc] initWithBytes:result length:CC_MD5_DIGEST_LENGTH];
+}
+
+-(NSData *)MD5Digest {
+    return [NSData MD5Digest:self];
+}
+
++(NSString *)MD5HexDigest:(NSData *)input {
+    unsigned char result[CC_MD5_DIGEST_LENGTH];
+    
+    CC_MD5(input.bytes, input.length, result);
+    NSMutableString *ret = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH*2];
+    for (int i = 0; i<CC_MD5_DIGEST_LENGTH; i++) {
+        [ret appendFormat:@"%02x",result[i]];
+    }
+    return ret;
+}
+
+-(NSString *)MD5HexDigest {
+    return [NSData MD5HexDigest:self];
+}
+
+@end

data/vendor/MD5SHA1Digest/NSData+SHA1Digest.h

@@ -0,0 +1,19 @@
+//
+//  NSData+SHA1Digest.h
+//  MD5SHA1Digest
+//
+//  Created by Tom Meinlschmidt on 28.2.2013.
+//  Copyright (c) 2013 Tom Meinlschmidt. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSData (SHA1Digest)
+
++(NSData *)SHA1Digest:(NSData *)input;
+-(NSData *)SHA1Digest;
+
++(NSString *)SHA1HexDigest:(NSData *)input;
+-(NSString *)SHA1HexDigest;
+
+@end

data/vendor/MD5SHA1Digest/NSData+SHA1Digest.m

@@ -0,0 +1,40 @@
+//
+//  NSData+SHA1Digest.m
+//  MD5SHA1Digest
+//
+//  Created by Tom Meinlschmidt on 28.2.2013.
+//  Copyright (c) 2013 Tom Meinlschmidt. All rights reserved.
+//
+
+#import "NSData+SHA1Digest.h"
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation NSData (SHA1)
+
++(NSData *)SHA1Digest:(NSData *)input {
+    unsigned char result[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(input.bytes, input.length, result);
+    return [[NSData alloc] initWithBytes:result length:CC_SHA1_DIGEST_LENGTH];
+}
+
+-(NSData *)SHA1Digest {
+    return [NSData SHA1Digest:self];
+}
+
++(NSString *)SHA1HexDigest:(NSData *)input {
+    unsigned char result[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(input.bytes, input.length, result);
+    NSMutableString *ret = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH*2];
+    for (int i = 0; i<CC_SHA1_DIGEST_LENGTH; i++) {
+        [ret appendFormat:@"%02x",result[i]];
+    }
+    return ret;
+}
+
+-(NSString *)SHA1HexDigest {
+    return [NSData SHA1HexDigest:self];
+}
+
+@end

data/vendor/MD5SHA1Digest/NSData+SHA256Digest.h

@@ -0,0 +1,16 @@
+//
+//  NSData+SHA1Digest.h
+//  MD5SHA1Digest
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSData (SHA256Digest)
+
++(NSData *)SHA256Digest:(NSData *)input;
+-(NSData *)SHA256Digest;
+
++(NSString *)SHA256HexDigest:(NSData *)input;
+-(NSString *)SHA256HexDigest;
+
+@end

data/vendor/MD5SHA1Digest/NSData+SHA256Digest.m

@@ -0,0 +1,38 @@
+//
+//  NSData+SHA256Digest.m
+//  MD5SHA1Digest
+//
+//
+
+#import "NSData+SHA256Digest.h"
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation NSData (SHA256)
+
++(NSData *)SHA256Digest:(NSData *)input {
+    unsigned char result[CC_SHA256_DIGEST_LENGTH];
+    
+    CC_SHA256(input.bytes, input.length, result);
+    return [[NSData alloc] initWithBytes:result length:CC_SHA256_DIGEST_LENGTH];
+}
+
+-(NSData *)SHA256Digest {
+    return [NSData SHA256Digest:self];
+}
+
++(NSString *)SHA256HexDigest:(NSData *)input {
+    unsigned char result[CC_SHA256_DIGEST_LENGTH];
+    
+    CC_SHA256(input.bytes, input.length, result);
+    NSMutableString *ret = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH*2];
+    for (int i = 0; i<CC_SHA256_DIGEST_LENGTH; i++) {
+        [ret appendFormat:@"%02x",result[i]];
+    }
+    return ret;
+}
+
+-(NSString *)SHA256HexDigest {
+    return [NSData SHA256HexDigest:self];
+}
+
+@end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-menu
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rm-digest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 description: An easy way to define menu items and visually lay out menus for your
   RubyMotion OSX apps. Based on the drink-menu gem that I couldn't get to work for
   me.
@@ -81,6 +67,12 @@ files:
 - spec/menu_builder_spec.rb
 - spec/menu_item_spec.rb
 - spec/menu_spec.rb
+- vendor/MD5SHA1Digest/NSData+MD5Digest.h
+- vendor/MD5SHA1Digest/NSData+MD5Digest.m
+- vendor/MD5SHA1Digest/NSData+SHA1Digest.h
+- vendor/MD5SHA1Digest/NSData+SHA1Digest.m
+- vendor/MD5SHA1Digest/NSData+SHA256Digest.h
+- vendor/MD5SHA1Digest/NSData+SHA256Digest.m
 homepage: https://github.com/henderea/everyday-menu
 licenses:
 - MIT