plist4r 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/plist4r/mixin/array_dict.rb

@@ -27,6 +27,10 @@ module Plist4r
       @hash
     end
 
+    def to_hash
+      @hash
+    end
+
     # Select (keep) plist keys from the object.
     # Copy them to the resultant object moving forward.
     # @param [Array, *args] keys The list of Plist Keys to keep

data/lib/plist4r/mixin/data_methods.rb

@@ -23,6 +23,7 @@ module Plist4r
       :hash_of_arrays => [Hash],
       :hash_of_arrays_of_strings => [Hash],
       :hash => [Hash],
+      :bool_or_hash_of_bools => [TrueClass,FalseClass,Hash],
       :bool_or_string_or_array_of_strings => [TrueClass,FalseClass,String,Array]
     }
 

data/lib/plist4r/mixin/ruby_stdlib.rb

@@ -181,6 +181,20 @@ class String
     @blob
   end
 
+  # Remove the leading spaces of the first line, and same to all lines of a multiline string.
+  # This effectively shifts all the lines across to the left, until the first line hits the 
+  # left margin.
+  # @example
+  #   def usage; <<-EOS.undent
+  #     # leading indent
+  #     # subsequent indent
+  #        # subsequent indent + '  '
+  #     EOS
+  #   end
+  def undent
+    gsub /^.{#{slice(/^ +/).length}}/, ''
+  end
+
   # A Camel-ized string. The reverse of {#snake_case}
   # @example
   #  "my_plist_key".camelcase => "MyPlistKey"

data/lib/plist4r/plist.rb

@@ -323,7 +323,7 @@ module Plist4r
     #    p_f_release_version(new_ver)
     #  end
     def edit *args, &blk
-      @plist_type.hash @hash
+      @plist_type.to_hash @hash
       instance_eval *args, &blk
       detect_plist_type if plist_type == :plist
     end
@@ -335,7 +335,7 @@ module Plist4r
     # @see Plist4r::DataMethods#method_missing
     # @see #plist_type
     def method_missing method_sym, *args, &blk
-      @plist_type.method_missing method_sym, *args, &blk
+      eval "@plist_type.#{method_sym} *args, &blk"
     end
   
     # Backend method to set or return all new plist data resulting from a backend API. Used in load operations.
@@ -467,7 +467,7 @@ module Plist4r
     def delete_if *keys, &blk
       delete *keys
       @hash.delete_if &blk
-      @plist_type.hash @hash
+      @plist_type.to_hash @hash
     end
 
     # Clears all plist keys and their contents
@@ -485,7 +485,7 @@ module Plist4r
     def merge! other_plist
       if plist_type == other_plist.plist_type
         @hash.merge! other_plist.to_hash
-        @plist_type.hash @hash
+        @plist_type.to_hash @hash
       else
         raise "plist_type differs, one is #{plist_type.inspect}, and the other is #{plist.plist_type.inspect}"
       end

data/lib/plist4r/plist_type.rb

@@ -17,7 +17,7 @@ module Plist4r
     # Set or return the plist's raw data object
     # @param [Plist4r::OrderedHash] hash Set the hash if not nil
     # @return [Plist4r::OrderedHash] @hash
-    def hash hash=nil
+    def to_hash hash=nil
       case hash
       when ::Plist4r::OrderedHash
         @hash = @orig = hash
@@ -65,8 +65,8 @@ module Plist4r
     def array_dict method_sym, *args
       a = ArrayDict.new @hash
       result = eval "a.#{method_sym} *args"
-      @hash = @orig = a.hash
-      @plist.import_hash a.hash
+      @hash = @orig = a.to_hash
+      @plist.import_hash a.to_hash
     end
   end
 end

data/lib/plist4r/plist_type/launchd.rb

@@ -61,7 +61,7 @@ module Plist4r
       ValidKeys =
       {
         :bool => %w[SuccessfulExit NetworkState],
-        :hash_of_bools => %w[PathState OtherJobEnabled]
+        :bool_or_hash_of_bools => %w[PathState OtherJobEnabled]
       }
     end
 
@@ -115,12 +115,13 @@ module Plist4r
       key = "KeepAlive"
     
       case value
-      when TrueCass, FalseClass
+      when TrueClass, FalseClass
         @hash[key] = value
       when nil
-        if blk
-          @hash[key] ||= ::Plist4r::OrderedHash.new
-          @hash[key] = ::LaunchdPlistStructs::KeepAlive.new(@hash[key],&blk).hash
+        if block_given?
+          puts KeepAlive.new(@hash[key],&blk).to_hash
+          @hash[key] = ::Plist4r::OrderedHash.new
+          @hash[key] = KeepAlive.new(@hash[key],&blk).to_hash
         else
           @hash[key]
         end
@@ -221,7 +222,7 @@ module Plist4r
       end
       if blk
         @hash[key] ||= []
-        h = ::LaunchdPlistStructs::StartCalendarInterval.new(@hash[key],index,&blk).hash
+        h = StartCalendarInterval.new(@hash[key],index,&blk).to_hash
         if index
           @hash[key][index] = h
         else
@@ -296,7 +297,7 @@ module Plist4r
       key = "SoftResourceLimits"
       if blk
         @hash[key] ||= ::Plist4r::OrderedHash.new
-        @hash[key] = ::LaunchdPlistStructs::ResourceLimits.new(@hash[key],&blk).hash
+        @hash[key] = ResourceLimits.new(@hash[key],&blk).to_hash
       else
         @hash[key]
       end
@@ -361,7 +362,7 @@ module Plist4r
       key = "HardResourceLimits"
       if blk
         @hash[key] ||= ::Plist4r::OrderedHash.new
-        @hash[key] = ::LaunchdPlistStructs::ResourceLimits.new(@hash[key],&blk).hash
+        @hash[key] = ResourceLimits.new(@hash[key],&blk).to_hash
       else
         @hash[key]
       end
@@ -378,7 +379,7 @@ module Plist4r
           set_or_return_of_type :bool, service, value
         elsif blk
           @hash[service] = ::Plist4r::OrderedHash.new
-          @hash[service] = ::LaunchdPlistStructs::MachServices::MachService.new(@hash[service],&blk).hash
+          @hash[service] = MachServices::MachService.new(@hash[service],&blk).to_hash
         else
           @orig
         end
@@ -428,7 +429,7 @@ module Plist4r
       key = "MachServices"
       if blk
         @hash[key] ||= ::Plist4r::OrderedHash.new
-        @hash[key] = ::LaunchdPlistStructs::MachServices.new(@hash[key],&blk).hash
+        @hash[key] = MachServices.new(@hash[key],&blk).to_hash
       else
         @hash[key]
       end
@@ -450,13 +451,13 @@ module Plist4r
       end
 
       def add_socket_to_dictionary key, &blk
-        @hash[key] = ::LaunchdPlistStructs::Sockets::Socket.new(@hash[key],&blk).hash
+        @hash[key] = Sockets::Socket.new(@hash[key],&blk).to_hash
       end
 
       def add_socket_to_array key, index, &blk
         @orig[key] = [] unless @orig[key].class == Array
         @hash[key] ||= []
-        @hash[key][index] = ::LaunchdPlistStructs::Sockets::Socket.new(@orig[key],index,&blk).hash
+        @hash[key][index] = Sockets::Socket.new(@orig[key],index,&blk).to_hash
       end
 
       def add_socket plicity, key, index=nil, &blk
@@ -661,7 +662,7 @@ module Plist4r
       key = "Sockets"
       if blk
         @hash[key] ||= ::Plist4r::OrderedHash.new
-        sockets = ::LaunchdPlistStructs::Sockets.new(@hash[key]).hash
+        sockets = Sockets.new(@hash[key]).to_hash
       
         case index_or_key
         when nil

data/plist4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plist4r}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dreamcat4"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-18}
   s.default_executable = %q{plist4r}
   s.description = %q{Plist4r is for editing Plist files in an easy-to-use, fast, and reliabile way. A comprehensive and fully featured Ruby library. Xml and Binary file formats are supported, with backends for Linux and Mac.}
   s.email = %q{dreamcat4@gmail.com}

data/spec/plist4r/mixin/array_dict_spec.rb

@@ -30,7 +30,7 @@ describe Plist4r::ArrayDict, "#hash" do
   
   it "should return @hash" do
     @array_dict.instance_eval { @hash = "hash" }
-    @array_dict.hash.should == "hash"
+    @array_dict.to_hash.should == "hash"
   end
 end
 

data/spec/plist4r/plist_spec.rb

@@ -389,10 +389,10 @@ describe Plist4r::Plist, "#method_missing" do
     @plist = Plist4r::Plist.new
   end
 
-  it "should call @plist_type.send with the supplied arguments" do
-    method_missing_args = [:method_sym, :arg1, :arg2, :etc]
-    @plist_type.should_receive(:method_missing).with(method_missing_args)
-    @plist.method_missing(method_missing_args)
+  it "should call eval with @plist_type.#{:method_sym} and the supplied arguments" do
+    method_missing_args = [:arg1, :arg2, :etc]
+    @plist_type.should_receive(:method_sym).with(*method_missing_args)
+    @plist.method_missing(:method_sym,*method_missing_args)
   end
 end
 
@@ -627,8 +627,8 @@ describe Plist4r::Plist, "#delete_if" do
     @plist.delete_if :arg1, :arg2
   end
   
-  it "should call @plist_type.hash with @hash" do
-    @plist_type.should_receive(:hash).with(@hash)
+  it "should call @plist_type.to_hash with @hash" do
+    @plist_type.should_receive(:to_hash).with(@hash)
     @plist.delete_if :arg1, :arg2
   end
 end
@@ -675,7 +675,7 @@ describe Plist4r::Plist, "#merge!" do
     @plist.stub!(:plist_type).and_return(:plist_type)
     @other_plist.stub!(:plist_type).and_return(:plist_type)
     @hash.should_receive(:merge!).with(@other_hash)
-    @plist_type.should_receive(:hash).with(@hash)
+    @plist_type.should_receive(:to_hash).with(@hash)
 
     @plist.merge! @other_plist
   end

data/spec/plist4r/plist_type_spec.rb

@@ -26,18 +26,18 @@ describe Plist4r::PlistType, "#hash" do
   
   it "should set @hash and @orig if the supplied hash is a Plist4r::OrderedHash" do
     hash = Plist4r::OrderedHash.new
-    @plist_type.hash(hash)
+    @plist_type.to_hash(hash)
     @plist_type.instance_eval { @hash }.should == hash
     @plist_type.instance_eval { @orig }.should == hash
   end
   
   it "should return @hash if there are no supplied arguments" do
-    @plist_type.hash.should == "hash"
+    @plist_type.to_hash.should == "hash"
   end
 
   it "should raise an error when the supplied argument is not a Plist4r::OrderedHash, or nil" do
     not_a_plist4r_ordered_hash_or_nil = false
-    lambda { @plist_type.hash(not_a_plist4r_ordered_hash_or_nil) }.should raise_error(Exception)
+    lambda { @plist_type.to_hash(not_a_plist4r_ordered_hash_or_nil) }.should raise_error(Exception)
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - dreamcat4
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +01:00
+date: 2010-08-18 00:00:00 +01:00
 default_executable: plist4r
 dependencies: 
 - !ruby/object:Gem::Dependency