emonti-ffi_dry 0.1.1 → 0.1.2

data/Rakefile

@@ -43,3 +43,18 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+require 'rake/rdoctask' 
+Rake::RDocTask.new do |rdoc| 
+  if File.exist?('VERSION') 
+    version = File.read('VERSION') 
+  else 
+    version = "" 
+  end 
+ 
+  rdoc.rdoc_dir = 'rdoc' 
+  rdoc.title = "ffi_dry #{version}" 
+  rdoc.rdoc_files.include('README*') 
+  rdoc.rdoc_files.include('lib/**/*.rb') 
+end
+

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/ffi_dry.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ffi_dry}
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Eric Monti"]
+  s.date = %q{2009-09-13}
+  s.description = %q{Provides a some useful modules, classes, and methods as well as a DSL-like syntax for FFI::Struct layouts}
+  s.email = %q{emonti@matasano.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "ffi_dry.gemspec",
+     "lib/ffi/dry.rb",
+     "lib/ffi_dry.rb",
+     "samples/afmap.rb",
+     "samples/basic.rb",
+     "samples/describer.rb",
+     "spec/ffi_dry_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/emonti/ffi_dry}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Syntactic sugar and helper utilities for FFI}
+  s.test_files = [
+    "spec/ffi_dry_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi-ffi>, [">= 0.5.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+    else
+      s.add_dependency(%q<ffi-ffi>, [">= 0.5.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<ffi-ffi>, [">= 0.5.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+  end
+end

data/lib/ffi/dry.rb

@@ -76,6 +76,9 @@ module FFI::DRY
     # the :raw tag.
     #
     def initialize(*args)
+      @dsl_metadata = self.class.dsl_metadata
+      params=nil
+
       if args.size == 1 and (oparams=args[0]).is_a? Hash
         params = oparams.dup
         if raw=params.delete(:raw)
@@ -83,11 +86,11 @@ module FFI::DRY
         else
           super()
         end
-        set_fields(params)
       else
         super(*args)
       end
-      @dsl_metadata = self.class.dsl_metadata
+
+      set_fields(params)
       yield self if block_given?
     end
 
@@ -103,8 +106,8 @@ module FFI::DRY
     # This method is called automatically if you are using the initialize() 
     # method provided in the DryStruct class and passing it a Hash as its only
     # argument.
-    def set_fields(params)
-      params.keys.each do |p|
+    def set_fields(params=nil)
+      (params || {}).keys.each do |p|
         if members().include?(p)
           self.__send__(:"#{p}=", params[p])
         else
@@ -157,11 +160,11 @@ module FFI::DRY
         builder.instance_eval(&block)
         @layout = builder.build
         @size = @layout.size
-        _class_do_dsl_metadata( builder.metadata )
+        _class_meths_from_dsl_metadata( builder.metadata )
         return @layout
       end
 
-      def _class_do_dsl_metadata(meta)
+      def _class_meths_from_dsl_metadata(meta)
         (@dsl_metadata = meta).each do |spec|
           name = spec[:name]
           type = spec[:type]
@@ -340,7 +343,12 @@ module FFI::DRY
     def [](arg)
       if arg.is_a? Integer
         ret = []
-        list.invert.sort.each {|v,n| ret << n if (v & arg) == v }
+        if arg == 0
+          n = list.invert[0]
+          ret << n if n
+        else
+          list.invert.sort.each {|v,n| ret << n if v !=0 and (v & arg) == v }
+        end
         return ret
       elsif arg.is_a? String or arg.is_a? Symbol
         list[arg.to_s.upcase]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emonti-ffi_dry
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- ffi_dry.gemspec
 - lib/ffi/dry.rb
 - lib/ffi_dry.rb
 - samples/afmap.rb
@@ -67,7 +68,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/emonti/ffi_dry
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Syntactic sugar and helper utilities for FFI