odf-converter 0.0.1 → 0.0.2

data/lib/odf/config.rb

@@ -0,0 +1,34 @@
+require 'active_support/configurable'
+
+module ODF
+  # Configures global settings for ODF
+  #   ODF.configure do |config|
+  #     config.port = 3111
+  #   end
+  def self.configure(&block)
+    yield @config ||= ODF::Configuration.new
+  end
+
+  # Global settings for ODF::Converter
+  def self.config
+    @config
+  end
+
+  # need a Class for 3.0
+  class Configuration #:nodoc:
+    include ActiveSupport::Configurable
+    
+    config_accessor :office_bin
+    config_accessor :connection_type
+    config_accessor :host
+    config_accessor :port
+  end
+
+  # this is ugly. why can't we pass the default value to config_accessor...?
+  configure do |config|
+    config.office_bin = "soffice"
+    config.connection_type = :socket
+    config.host = :localhost
+    config.port = 2083 
+  end
+end

data/lib/odf/converter/hash.rb

@@ -1,7 +1,9 @@
+Uno::PropertyValue = Rubyuno.uno_require "com.sun.star.beans.PropertyValue"
+
 class Hash
   def to_uno_properties
     self.inject([]) do |memo, (key, value)|
-      property = ODF::PropertyValue.new
+      property = Uno::PropertyValue.new
       property.Name = key.to_s
       property.Value = value.to_s
       memo << property

data/lib/odf/converter/version.rb

@@ -1,5 +1,5 @@
 module ODF
   class Converter
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/odf/converter.rb

@@ -1,21 +1,21 @@
 require "rubyuno"
-require "odf/converter/version"
+require "odf/config"
 require "odf/converter/families"
 require "odf/converter/filters/base_filter"
 require "odf/converter/filters/import"
 require "odf/converter/filters/export"
 require "odf/converter/hash"
+require "odf/converter/version"
 
 module ODF
-  PropertyValue = Rubyuno.uno_require "com.sun.star.beans.PropertyValue"
-  
   class Converter
     class DocumentConversionError < Exception; end
     
     attr_reader :ctx, :smgr, :desktop, :document
     
     def initialize
-      @ctx = Uno::Connector.bootstrap("soffice", "socket", "localhost", 8100)
+      config = ODF.config
+      @ctx = Uno::Connector.bootstrap(config.office_bin.to_s, config.connection_type.to_s, config.host.to_s, config.port)
       @smgr = @ctx.getServiceManager
       @desktop = @smgr.createInstanceWithContext("com.sun.star.frame.Desktop", @ctx)
     end
@@ -35,10 +35,14 @@ module ODF
       perform_conversion(infile, outfile) && outfile
     end
     
+    def inspect
+      "#<#{self.class.name} #{self.class.config.office_bin}@#{self.class.config.host}:#{self.class.config.port}>"
+    end
+    
     def self.convert(*args)
       new.convert(*args)
     end
-  
+    
   private
     def detect_family(doc)
       return Families::WEB if doc.supportsService("com.sun.star.text.WebDocument")

data/lib/odf-converter.rb

@@ -1,3 +1,4 @@
 require "rubyuno"
+require "odf/config"
 require "odf/converter/version"
 require "odf/converter"

data/odf-converter.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = ODF::Converter::VERSION
   
   gem.add_dependency "rubyuno"
-  gem.add_development_dependency "pry"
-  gem.add_development_dependency "pry-editline"
+  gem.add_dependency 'activesupport', ['>= 3.0.0']
+  
   gem.add_development_dependency "rspec"
 end

data/spec/odf/converter_spec.rb

@@ -10,7 +10,10 @@ describe ODF::Converter do
     let(:c) { ODF::Converter.new }
     
     describe do
-      before { c.stub(:perform_conversion) { true } }
+      before do
+        Uno::Connector.stub_chain(:bootstrap, :getServiceManager, :createInstanceWithContext)
+        c.stub(:perform_conversion) { true }
+      end
       
       it "should raise an error if the to option is not given" do
         expect { c.convert("infile.txt") }.to raise_error ArgumentError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odf-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyuno
-  requirement: &20530940 !ruby/object:Gem::Requirement
+  requirement: &22699960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20530940
+  version_requirements: *22699960
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &20530480 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &22698340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *20530480
-- !ruby/object:Gem::Dependency
-  name: pry-editline
-  requirement: &20529660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  version_requirements: *20529660
+  version_requirements: *22698340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20528780 !ruby/object:Gem::Requirement
+  requirement: &22696080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20528780
+  version_requirements: *22696080
 description: Ruby library for converting ODF files through OO.org
 email:
 - dvandersluis@selfmgmt.com
@@ -68,6 +57,7 @@ files:
 - README.md
 - Rakefile
 - lib/odf-converter.rb
+- lib/odf/config.rb
 - lib/odf/converter.rb
 - lib/odf/converter/families.rb
 - lib/odf/converter/filters/base_filter.rb