hyperion-api 0.0.1.alpha4 → 0.0.1.alpha5

data/lib/hyperion/api.rb

@@ -23,8 +23,9 @@ module Hyperion
       # Assigns the datastore within the given block
       def with_datastore(name, opts={})
         self.datastore = new_datastore(name, opts)
-        yield
+        result = yield
         self.datastore = nil
+        result
       end
 
       def new_datastore(name, opts={})
@@ -167,7 +168,7 @@ module Hyperion
       def format_record(record)
         if record
           record = record.reduce({}) do |new_record, (key, value)|
-            new_record[snake_case(key.to_s).to_sym] = value
+            new_record[Util.snake_case(key.to_s).to_sym] = value
             new_record
           end
           record[:kind] = format_kind(record[:kind])
@@ -176,16 +177,11 @@ module Hyperion
       end
 
       def format_kind(kind)
-        snake_case(kind.to_s)
+        Util.snake_case(kind.to_s)
       end
 
       def format_field(field)
-        snake_case(field.to_s).to_sym
-      end
-
-      def snake_case(str)
-        separate_camel_humps = str.gsub(/([a-z0-9])([A-Z])/, '\1 \2').downcase
-        separate_camel_humps.gsub(/[ |\-]/, '_')
+        Util.snake_case(field.to_s).to_sym
       end
 
     end

data/lib/hyperion/util.rb

@@ -4,13 +4,40 @@ module Hyperion
     class << self
 
       def camel_case(str)
-        str.gsub(/[_| |\-][A-Za-z]/) { |a| a[1..-1].upcase }
+        cameled = str.gsub(/[_| |\-][A-Za-z]/) { |a| a[1..-1].upcase } if str
+        uncapitalize(cameled)
       end
 
       def class_name(str)
-        cameled = camel_case(str)
-        cameled[0] = cameled[0...1].capitalize
-        cameled
+        capitalize(camel_case(str))
+      end
+
+      def snake_case(str)
+        str.gsub(/([a-z0-9])([A-Z])/, '\1 \2').downcase.gsub(/[ |\-]/, '_') if str
+      end
+
+      def capitalize(str)
+        do_to_first(str) do |first_letter|
+          first_letter.upcase
+        end
+      end
+
+      def uncapitalize(str)
+        do_to_first(str) do |first_letter|
+          first_letter.downcase
+        end
+      end
+
+      def do_to_first(str)
+        if str
+          first = yield(str[0, 1])
+          if str.length > 1
+            last = str[1..-1]
+            first + last
+          else
+            first
+          end
+        end
       end
 
     end

data/spec/hyperion/api_spec.rb

@@ -12,6 +12,12 @@ describe Hyperion::API do
     it 'will throw an error if the datastore is called before assignment' do
       expect{ subject.datastore }.to raise_error
     end
+
+    it 'assigns datastore and returns the result' do
+      api.with_datastore(:memory) do
+        :return
+      end.should == :return
+    end
   end
 
   context 'factory' do

data/spec/hyperion/util_spec.rb

@@ -15,6 +15,25 @@ describe Hyperion::Util do
     util.camel_case('with spaces').should == 'withSpaces'
     util.camel_case('with-dash').should == 'withDash'
     util.camel_case('starting Capital').should == 'startingCapital'
+    util.camel_case('StartingCapital').should == 'startingCapital'
+    util.camel_case('O').should == 'o'
+    util.camel_case('').should == ''
+    util.camel_case(nil).should == nil
+  end
+
+  it 'snake cases words' do
+    util.snake_case('fake_ds').should == 'fake_ds'
+    util.snake_case('defaultSceneName').should == 'default_scene_name'
+    util.snake_case('set defaultSceneName').should == 'set_default_scene_name'
+    util.snake_case('class_name').should == 'class_name'
+    util.snake_case('once_upon_a_time').should == 'once_upon_a_time'
+    util.snake_case('with spaces').should == 'with_spaces'
+    util.snake_case('with-dash').should == 'with_dash'
+    util.snake_case('starting Capital').should == 'starting_capital'
+    util.snake_case('StartingCapital').should == 'starting_capital'
+    util.snake_case('O').should == 'o'
+    util.snake_case('').should == ''
+    util.snake_case(nil).should == nil
   end
 
   it 'converts to class name' do
@@ -26,5 +45,10 @@ describe Hyperion::Util do
     util.class_name('with spaces').should == 'WithSpaces'
     util.class_name('with-dash').should == 'WithDash'
     util.class_name('starting Capital').should == 'StartingCapital'
+    util.class_name('StartingCapital').should == 'StartingCapital'
+    util.class_name('S').should == 'S'
+    util.class_name('s').should == 'S'
+    util.class_name('').should == ''
+    util.class_name(nil).should == nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha4
+  version: 0.0.1.alpha5
   prerelease: 6
 platform: ruby
 authors: