encoding-codepage 0.1 → 0.2

data/README.md

@@ -37,7 +37,7 @@ For seeing whether code-pages exist:
     Encoding.codepage?(37)
     # => nil
 
-Also makes all supported Code Pages available with a `CP` prefix:
+It also makes all supported Code Pages available as object with a `CP` prefix:
 
     Encoding::CP28591
     # => #<Encoding:CP28591>
@@ -45,6 +45,14 @@ Also makes all supported Code Pages available with a `CP` prefix:
     Encoding.find("CP28591")
     # => #<Encoding:CP28591>
 
+And adds a method to `Encoding` objects for discovering their Code Page Identifier:
+
+    Encoding::UTF_8.codepage_id
+    # => 65001
+
+    Encoding::ISO_8859_1.codepage_id
+    # => 28591
+
 Encodings
 =========
 

data/lib/encoding-codepage.rb

@@ -54,8 +54,10 @@ class Encoding
         number, original, comment = line.split("\t", 3)
         number = Integer(number, 10)
 
-        if !codepage?(number) && exist?(original.upcase)
-          Encoding.find(original.upcase).replicate "CP#{number}"
+        if encoding = exist?(original.upcase)
+          encoding.replicate "CP#{number}" unless codepage?(number)
+
+          CodePage.reverse_lookup[encoding] = codepage(number)
         end
       }
     end
@@ -63,8 +65,34 @@ class Encoding
     def codepage_file
       File.join(File.dirname(__FILE__), "codepages.tsv")
     end
+
+    # A Hash from <non-codepage-encoding> to <codepage-encoding> to facilitate running
+    # codepage_id in the case where Ruby has both the CodePage encoding and its alias, but
+    # thinks they are different Encodings.
+    #
+    def self.reverse_lookup
+      @reverse_lookup ||= {}
+    end
+  end
+
+  module CodePageMethods
+    # Find the code-page id that corresponds to this encoding.
+    #
+    # @return Integer       The Code Page Identifier
+    # @raise  ArgumentError There is no Code Page Identifier for that Encoding.
+    #
+    def codepage_id
+      if names.detect{ |x| x =~ /\ACP([0-9]+)\z/ }
+        Integer($1, 10)
+      elsif codepage_encoding = CodePage.reverse_lookup[self]
+        codepage_encoding.codepage_id
+      else
+        raise ArgumentError, "No Code Page Idenfier found for: #{self}"
+      end
+    end
   end
 
   extend CodePage
+  include CodePageMethods
   load_codepages!
 end

metadata

@@ -1,53 +1,70 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: encoding-codepage
-version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  version: "0.2"
 platform: ruby
-authors:
+authors: 
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+
+date: 2012-04-02 00:00:00 -07:00
+default_executable: 
 dependencies: []
-description: Provides aliases for Encodings that have Code Page Identifiers to make
-  it easier to interface with Microsoft APIs that use Code Page Identifiers to describe
-  content
+
+description: Provides aliases for Encodings that have Code Page Identifiers to make it easier to interface with Microsoft APIs that use Code Page Identifiers to describe content
 email: conrad.irwin@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/encoding-codepage.rb
 - lib/codepages.tsv
 - README.md
 - LICENSE.MIT
 - LICENSE.MLPL
+has_rdoc: true
 homepage: https://github.com/ConradIrwin/encoding-codepage
-licenses:
+licenses: 
 - MIT, Microsoft Limited Public License
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Allow looking up Encodings by their Code Page Identifier
 test_files: []
-has_rdoc: 
+