language_detection 0.0.1 → 0.0.2

data/README.md

@@ -22,15 +22,15 @@ Or install it yourself as:
 >> require 'language_detection'
 => true
 >> language = LanguageDetection.perform("This is some example text for language detection")
-=> {:name=>"ENGLISH", :code=>"en", :reliable=>true, :text_bytes=>51, :details=>[{:name=>"ENGLISH", :code=>"en", :percent=>100, :score=>49.43273905996759}]}
+=> #<LanguageDetection::Language:0x007fae0404f628 @name="english", @code="en", @reliable=true, @text_bytes=51, @details=[#<LanguageDetection::Language:0x007fae0404eb10 @name="english", @code="en", @details=[], @percent=100, @score=49.43273905996759>]>
 >> language.name
-=> "ENGLISH"
+=> "english"
 >> language.code
 => "en"
 >> language.reliable
 => true
 >> language.details # contains up to 3 languages sorted by score
-=> [{:name=>"ENGLISH", :code=>"en", :percent=>100, :score=>49.43273905996759}]
+=> [#<LanguageDetection::Language:0x007fae0404eb10 @name="english", @code="en", @details=[], @percent=100, @score=49.43273905996759>]
 >> language.details.first.percent
 => 100
 >> language.details.first.score
@@ -61,7 +61,7 @@ which provides `Article#language` method using `Article#to_s` method as paramete
 ```ruby
 >> article = Article.new :title => "Web development that doesn't hurt", :content => "Tens of thousands of Rails applications are already live..."
 >> article.language
-=> {:name=>"ENGLISH", :code=>"en", :reliable=>true, :text_bytes=>93, :details=>[{:name=>"ENGLISH", :code=>"en", :percent=>100, :score=>80.22690437601297}]}
+=> #<LanguageDetection::Language:0x007fae049dd8e8 @name="english", @code="en", @reliable=true, @text_bytes=93, @details=[#<LanguageDetection::Language:0x007fae049dd118 @name="english", @code="en", @details=[], @percent=100, @score=80.22690437601297>]>
 ```
 
 or you can add `String#language` method by `require 'language_detection/string'`
@@ -72,7 +72,7 @@ or you can add `String#language` method by `require 'language_detection/string'`
 >> require 'language_detection/string'
 => true
 >> "Web development that doesn't hurt".language
-=> {:name=>"ENGLISH", :code=>"en", :reliable=>true, :text_bytes=>36, :details=>[{:name=>"ENGLISH", :code=>"en", :percent=>100, :score=>39.70826580226905}]}
+=> #<LanguageDetection::Language:0x007fae049cfec8 @name="english", @code="en", @reliable=true, @text_bytes=36, @details=[#<LanguageDetection::Language:0x007fae049cf7e8 @name="english", @code="en", @details=[], @percent=100, @score=39.70826580226905>]>
 ```
 
 

data/Rakefile

@@ -1,11 +1,24 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
 
 task :default => :test
 
-require 'rake/testtask'
+desc "Compile extension"
+task :compile do
+  path = File.expand_path("ext/cld/cld.so", File.dirname(__FILE__))
+
+  if !File.exists?(path) || ENV['RECOMPILE']
+    puts "Compiling extension..."
+    `cd #{File.expand_path("ext/cld/")} && make`
+  else
+    puts "Extension already compiled. To recompile set env variable RECOMPILE=true."
+  end
+end
+
 Rake::TestTask.new(:test) do |test|
+  Rake::Task["compile"].invoke
+
   test.libs << 'lib' << 'test'
   test.test_files = FileList['test/*_test.rb']
   test.verbose = true
-  # test.warning = true
 end

data/language_detection.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.version       = LanguageDetection::VERSION
   gem.authors       = ["Vojtech Hyza"]
   gem.email         = ["vhyza@vhyza.eu"]
-  gem.description   = %q{Language detection}
-  gem.summary       = %q{Wrapped Chrome's compact language detector}
-  gem.homepage      = ""
+  gem.description   = %q{Ruby bindings for Chromium Compact Language Detector}
+  gem.summary       = %q{Ruby bindings for Chromium Compact Language Detector}
+  gem.homepage      = "https://github.com/vhyza/language_detection"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.extensions    = ["ext/cld/extconf.rb"]
 
   gem.add_dependency "ffi"
-  gem.add_dependency "hashr"
   gem.add_dependency "rake"
 
   gem.add_development_dependency "shoulda"

data/lib/language_detection.rb

@@ -1,6 +1,6 @@
 require "language_detection/version"
+require "language_detection/language"
 require "ffi"
-require "hashr"
 
 module LanguageDetection
 
@@ -10,12 +10,11 @@ module LanguageDetection
     result             = language_detection(text.to_s, is_plain_text)
 
     language           = parse_result(result, result.members - [:details])
-    language[:details] = []
 
-    details = FFI::Pointer.new(LanguageDetection::Detail, result[:details])
+    details = FFI::Pointer.new(LanguageDetection::DetailStruct, result[:details])
     3.times do |i|
-      detail = parse_result(LanguageDetection::Detail.new(details[i]))
-      language[:details] << detail unless detail.code == 'un'
+      detail = parse_result(LanguageDetection::DetailStruct.new(details[i]))
+      language.details << detail unless detail.code == 'un'
     end
 
     language
@@ -28,19 +27,19 @@ module LanguageDetection
   private
 
   def self.parse_result(result, members = result.members)
-    Hashr.new(Hash[ members.map {|member| [member.to_sym, result[member]]} ])
+    Language.new(Hash[ members.map {|member| [member.to_sym, result[member]]} ])
   end
 
   extend FFI::Library
 
-  class Detail < FFI::Struct
+  class DetailStruct < FFI::Struct
     layout :name,    :string,
            :code,    :string,
            :percent, :int,
            :score,   :double
   end
 
-  class Language < FFI::Struct
+  class LanguageStruct < FFI::Struct
     layout :name,       :string,
            :code,       :string,
            :reliable,   :bool,
@@ -49,6 +48,6 @@ module LanguageDetection
   end
 
   ffi_lib File.expand_path("../../ext/cld/cld.so", __FILE__)
-  attach_function "language_detection","language_detection", [:buffer_in, :bool], Language.by_value
+  attach_function "language_detection","language_detection", [:buffer_in, :bool], LanguageStruct.by_value
 
 end

data/lib/language_detection/language.rb

@@ -0,0 +1,18 @@
+module LanguageDetection
+
+  class Language
+
+    attr_accessor :name, :code, :reliable, :text_bytes, :details, :percent, :score
+
+    def initialize(attributes = {})
+      attributes.each_pair do |attribute, value|
+        self.send("#{attribute}=", value)
+      end
+
+      @details ||= []
+      @name.downcase!
+    end
+
+  end
+
+end

data/lib/language_detection/version.rb

@@ -1,3 +1,3 @@
 module LanguageDetection
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/language_detection_test.rb

@@ -7,24 +7,23 @@ class LanguageDetectionTest < Test::Unit::TestCase
 
   context "Language detection" do
 
-    should "be able to convert result from native call to Hashr instance" do
+    should "be able to convert result from native call to Language instance" do
       result        = LanguageDetection.language_detection("this is some text", false)
       parsed_result = LanguageDetection.parse_result(result)
 
-      assert_kind_of LanguageDetection::Language, result
-      assert_kind_of Hashr, parsed_result
+      assert_kind_of LanguageDetection::LanguageStruct, result
+      assert_kind_of LanguageDetection::Language, parsed_result
 
-      assert_equal "ENGLISH", parsed_result.name
-      assert_nil   parsed_result.non_existing_property
+      assert_equal "english", parsed_result.name
     end
 
-    should "convert details from FFI pointer to Hashr instance" do
+    should "convert details from FFI pointer to Language instance" do
       language = LanguageDetection.perform("this is some text")
 
-      assert_kind_of Array,   language.details
-      assert_kind_of Hashr,   language.details.first
-      assert_equal "ENGLISH", language.details.first.name
-      assert_equal 65,        language.details.first.percent
+      assert_kind_of Array,                       language.details
+      assert_kind_of LanguageDetection::Language, language.details.first
+      assert_equal "english",                     language.details.first.name
+      assert_equal 65,                            language.details.first.percent
     end
 
     should "recognize languages in testing data" do
@@ -67,7 +66,7 @@ class LanguageDetectionTest < Test::Unit::TestCase
 
     should "return detected language" do
       language = @article.language
-      assert_equal "ENGLISH", language.name
+      assert_equal "english", language.name
       assert_equal true,      language.reliable
       assert_equal 100,       language.details.first.percent
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: language_detection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Language detection
+description: Ruby bindings for Chromium Compact Language Detector
 email:
 - vhyza@vhyza.eu
 executables: []
@@ -209,12 +193,13 @@ files:
 - ext/cld/languages/public/languages.h
 - language_detection.gemspec
 - lib/language_detection.rb
+- lib/language_detection/language.rb
 - lib/language_detection/string.rb
 - lib/language_detection/version.rb
 - test/_helper.rb
 - test/fixtures/languages.csv
 - test/language_detection_test.rb
-homepage: ''
+homepage: https://github.com/vhyza/language_detection
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -228,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 301210449373780646
+      hash: 3522077385673025298
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,13 +222,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 301210449373780646
+      hash: 3522077385673025298
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Wrapped Chrome's compact language detector
+summary: Ruby bindings for Chromium Compact Language Detector
 test_files:
 - test/_helper.rb
 - test/fixtures/languages.csv