wp-uppercrust 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ac18c350c41a5fca98b4a335f8e44b4fcdfc28
-  data.tar.gz: ec2a3fff7792a68c4389138047fd494de1db5c7d
+  metadata.gz: 78102c85e5215554c1ad6fe09584fb2c2900d577
+  data.tar.gz: ba7b2fc9887a3ed42640d6f7109011f051aae6d3
 SHA512:
-  metadata.gz: 78c5fc6755aeeceb74bc88e50283689cc0f819214d3da275b1408b0ce7f6b776e930498b70fc1ade5ead2129060acf9db92644cb6291a23e9fc7624f6883efec
-  data.tar.gz: 78a3ee2e1785424e121c1ef91e69271d2537a4f94b0f70224c8e13c74d1c2e0d82f0a6fc298fea04b829c223bb6003e9e63ff5ebf02ddb485948f6ea5e2d6abb
+  metadata.gz: 33142374fd80687db5dcfb0c08dfb6d9711c74cf02ebeba373d4eb37fdeb3f6b861cebf13a29f5e700e45665c683e5e4ddb13c5df72bb90c5ba3e91f4c533b16
+  data.tar.gz: fc46e34c360f50fb1fbb25f9954075dd6f0611646eec417e7b8a0c6775d4dd8ee9145cbeb51788e951e81e263b75307d14ab8d37bd89e15fc1190495a27f07dc

data/lib/uppercrust/parser.rb

@@ -57,11 +57,11 @@ class Parser
 
     properties.each do |name, type_info|
       if self.match_type(type_info['type']) == 'NSArray' && type_info['items']['$ref'] != nil && type_info['items']['$ref'] != '#'
-        contains << "#import \"_#{self.snake_to_camel(Pathname.new(type_info['items']['$ref']).basename('.json').to_s)}.h\""
+        contains << "#import \"#{self.snake_to_camel(Pathname.new(type_info['items']['$ref']).basename('.json').to_s)}.h\""
       end
       
       if self.match_type(type_info['type']) == 'NSObject' && type_info['$ref'] != nil && type_info['$ref'] != '#'
-          contains << "#import \"_#{self.snake_to_camel(Pathname.new(type_info['$ref']).basename('.json').to_s)}.h\""
+          contains << "#import \"#{self.snake_to_camel(Pathname.new(type_info['$ref']).basename('.json').to_s)}.h\""
       end
     end
     contains.uniq
@@ -73,12 +73,12 @@ class Parser
     properties.each do |name, type_info|
       if self.match_type(type_info['type']) == 'NSArray' && type_info['items']['$ref'] != nil
         extends = type_info['items']['$ref'] != '#' ? self.snake_to_camel(Pathname.new(type_info['items']['$ref']).basename('.json').to_s) : @generated_class
-        array_converters << "+ (NSValueTransformer *)#{name}JSONTransformer\n{\n    return [NSValueTransformer mtl_JSONArrayTransformerWithModelClass:_#{extends}.class];\n}\n"
+        array_converters << "+ (NSValueTransformer *)#{name}JSONTransformer\n{\n    return [NSValueTransformer mtl_JSONArrayTransformerWithModelClass:#{extends}.class];\n}\n"
       end
       
       if self.match_type(type_info['type']) == 'NSObject' && type_info['$ref'] != nil
           extends = type_info['$ref'] != '#' ? self.snake_to_camel(Pathname.new(type_info['$ref']).basename('.json').to_s) : @generated_class
-          array_converters << "+ (NSValueTransformer *)#{name}JSONTransformer\n{\n    return [NSValueTransformer mtl_JSONDictionaryTransformerWithModelClass:_#{extends}.class];\n}\n"
+          array_converters << "+ (NSValueTransformer *)#{name}JSONTransformer\n{\n    return [NSValueTransformer mtl_JSONDictionaryTransformerWithModelClass:#{extends}.class];\n}\n"
       end
     end
 
@@ -128,11 +128,11 @@ class Parser
       
       if type == 'NSObject' && type_info['$ref'] != nil
           extends = type_info['$ref'] != '#' ? self.snake_to_camel(Pathname.new(type_info['$ref']).basename('.json').to_s) : @generated_class
-          extracted_properties << "@property(#{self.copy_type(type) ? 'copy' : 'assign'}, nonatomic, readonly) _#{extends} #{self.copy_type(type) ? '*' : ''}#{name};"
+          extracted_properties << "@property(#{self.copy_type(type) ? 'copy' : 'assign'}, nonatomic) #{extends} #{self.copy_type(type) ? '*' : ''}#{name};"
       elsif type == 'NSString' && type_info['format'] == 'date-time'
-        extracted_properties << "@property(strong, nonatomic, readonly) NSDate *#{name};"
+        extracted_properties << "@property(strong, nonatomic) NSDate *#{name};"
       else
-        extracted_properties << "@property(#{self.copy_type(type) ? 'copy' : 'assign'}, nonatomic, readonly) #{type} #{self.copy_type(type) ? '*' : ''}#{name};"
+        extracted_properties << "@property(#{self.copy_type(type) ? 'copy' : 'assign'}, nonatomic) #{type} #{self.copy_type(type) ? '*' : ''}#{name};"
       end
     end
 
@@ -163,13 +163,11 @@ class Parser
         'NSObject'
     end
   end
-
-  def upcase_first_letter(s):
-    return s[:1].upper() + s[1:]
-
+  
+ 
   def snake_to_camel(file_name)
       prefix = "WP"
-    (file_name.split('_').length > 1) ? file_name.split('_').map { |w| upcase_first_letter(w) }.join('') : prefix+upcase_first_letter(file_name)
+      (file_name.split('_').length > 1) ? file_name.split('_').map { |w| w.sub(/^./, &:upcase) }.join('') : prefix+file_name.sub(/^./, &:upcase)
   end
 
 end

data/lib/uppercrust/version.rb

@@ -1,3 +1,3 @@
 module Uppercrust
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp-uppercrust
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Workpop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor